diff -ur --new-file old/atm/.kernel new/atm/.kernel
--- old/atm/.kernel	Wed Mar 18 19:12:48 1998
+++ new/atm/.kernel	Sat Jun  6 04:23:03 1998
@@ -1,2 +1,2 @@
 # this file is used to control automated generation of differences
-2.1.90
+2.1.104
diff -ur --new-file old/atm/CHANGES new/atm/CHANGES
--- old/atm/CHANGES	Thu Apr 23 21:20:44 1998
+++ new/atm/CHANGES	Sat Jun  6 04:33:08 1998
@@ -1,3 +1,31 @@
+Version 0.36 to 0.37 (6-JUN-1998)
+====================
+
+Bug fixes
+---------
+
+ - lib/atm.h defined AF_ATMPVC to 20, but the correct value is 8. Likewise,
+   AF_ATMSVC should be 20, not 21. (Reported by Luke Diamand)
+ - fixed bad ASN encoding in ilmid (by Vesa-Matti Puro)
+ - make install and make instdirs didn't stop on error
+
+New features
+------------
+
+ - upgraded to the 2.1.104 kernel
+ - included a script to demonstrate the debug switch (see switch/debug/README)
+
+Other changes
+-------------
+
+ - moved definitions not used by the kernel from linux/atmarp.h to atmarp.h
+ - removed linux/atm_stdint.h (linux/types.h has now caught up)
+ - changed ENI and ZATM driver to use new PCI interface
+ - net/atm/clip.c no longer uses ether_setup (suggested by Alexey Kuznetsov)
+ - more header file cleanup (main change: applications should now
+   #include <atm.h> instead of #include <linux/atm.h>)
+
+
 Version 0.35 to 0.36 (23-APR-1998)
 ====================
 
diff -ur --new-file old/atm/README new/atm/README
--- old/atm/README	Thu Apr 23 20:55:09 1998
+++ new/atm/README	Sat Jun  6 04:18:10 1998
@@ -1,4 +1,4 @@
-ATM on Linux, release 0.36 (alpha)        by Werner Almesberger, EPFL ICA
+ATM on Linux, release 0.37 (alpha)        by Werner Almesberger, EPFL ICA
 ============================================== Werner.Almesberger@epfl.ch
 
 This is experimental software. There are known major bugs and certainly
@@ -9,7 +9,7 @@
 device drivers, source for demons, management and test tools, and some
 documentation.
 
-The kernel patch is relative to the "standard" 2.1.90 kernel.
+The kernel patch is relative to the "standard" 2.1.104 kernel.
 
 The following network devices are supported:
   ATM over TCP pseudo device for "dry runs"
diff -ur --new-file old/atm/Rules.make new/atm/Rules.make
--- old/atm/Rules.make	Thu Apr  9 08:45:39 1998
+++ new/atm/Rules.make	Sat Jun  6 03:00:33 1998
@@ -44,8 +44,10 @@
 CFLAGS_NOWARN=-g -DVERSION=\"`cat $(TOPDIR)/VERSION`\" \
   $(INCLUDES) -I$(TOPDIR)/lib
 CFLAGS_NOOPT=$(CFLAGS_NOWARN) -Wall -Wshadow -Wpointer-arith -Wcast-align \
-  -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-  #-Wmissing-declarations (gcc 2.6.x only) #-Wconversion (breaks inline)
+  -Wwrite-strings -Wstrict-prototypes 
+  # -Wmissing-prototypes (linux/byteorder is broken)
+  # -Wmissing-declarations (gcc 2.6.x only)
+  # -Wconversion (breaks inline)
 CFLAGS_OPT=-O2
 CFLAGS=$(CFLAGS_NOOPT) $(CFLAGS_OPT) $(CFLAGS_PRIVATE)
 CFLAGS_LEX=$(CFLAGS_NOWARN) $(CFLAGS_OPT)
@@ -110,7 +112,7 @@
 install:
 		@process() { if [ ! -z "$$3" ]; then mode=$$1; dir=$$2; \
 		  shift 2; echo "install -c -m $$mode $$* $$dir"; \
-		  install -c -m $$mode $$* $$dir; fi; }; \
+		  install -c -m $$mode $$* $$dir || exit 1; fi; }; \
 		  optprocess() { [ -z "$$3" -o -r "$$3" ] || process $$*; }; \
 		  $(PROCLIST)
 
@@ -120,7 +122,7 @@
 instdirs:
 		@process() { if [ ! -z "$$3" ]; then \
 		  echo "install -d $$2"; \
-		  install -d $$2; fi; }; \
+		  install -d $$2 || exit 1; fi; }; \
 		  optprocess() { :; }; \
 		  $(PROCLIST)
 
diff -ur --new-file old/atm/USAGE new/atm/USAGE
--- old/atm/USAGE	Thu Apr 23 20:57:29 1998
+++ new/atm/USAGE	Sat Jun  6 04:17:28 1998
@@ -1,4 +1,4 @@
-Usage instructions  -  ATM on Linux, release 0.36
+Usage instructions  -  ATM on Linux, release 0.37
 -------------------------------------------------
 
 For updates of ATM on Linux, please check the Web page at  
@@ -17,9 +17,9 @@
 In order to install this package, you need 
 
   - the package itself  
-    ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.36.tar.gz  
-  - the Linux kernel, version 2.1.90, e.g. from  
-    ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.1.90.tar.gz  
+    ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.37.tar.gz  
+  - the Linux kernel, version 2.1.104, e.g. from  
+    ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.1.104.tar.gz  
   - Perl, version 4 or 5 
   - if you want memory debugging: MPR version 1.6, e.g. from  
     ftp://sunsite.unc.edu/pub/Linux/devel/lang/c/mpr-1.6.tar.gz  
@@ -33,11 +33,11 @@
 all the files listed above there. Then extract the ATM on Linux 
 distribution:
 
-tar xfz atm-0.36.tar.gz
+tar xfz atm-0.37.tar.gz
 
 and the kernel source:
 
-tar xfz linux-2.1.90.tar.gz
+tar xfz linux-2.1.104.tar.gz
 
 Finally, you can extract the ATM-related patches:
 
diff -ur --new-file old/atm/VERSION new/atm/VERSION
--- old/atm/VERSION	Thu Apr 23 20:54:41 1998
+++ new/atm/VERSION	Wed Jun  3 16:44:15 1998
@@ -1 +1 @@
-0.36
+0.37
diff -ur --new-file old/atm/aqd/aqpvc.c new/atm/aqd/aqpvc.c
--- old/atm/aqd/aqpvc.c	Wed Mar 19 20:41:21 1997
+++ new/atm/aqd/aqpvc.c	Sat Jun  6 02:24:19 1998
@@ -1,6 +1,6 @@
 /* aqpvc.c - Sets up a PVC and awaits Arequipa traffic on it */
  
-/* Hacked 1997 by Werner Almesberger, EPFL-LRC */
+/* Hacked 1997,1998 by Werner Almesberger, EPFL-LRC/ICA */
  
 /*
  * Features:
@@ -16,7 +16,6 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <linux/atm.h>
 #include <atm.h>
 #include <linux/atmclip.h>
 #include <linux/arequipa.h>
diff -ur --new-file old/atm/aqd/io.c new/atm/aqd/io.c
--- old/atm/aqd/io.c	Mon Nov 10 02:06:51 1997
+++ new/atm/aqd/io.c	Sat Jun  6 02:21:51 1998
@@ -14,7 +14,6 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <linux/atm.h>
 #include <linux/arequipa.h>
 
 #include "atm.h"
diff -ur --new-file old/atm/arpd/Makefile new/atm/arpd/Makefile
--- old/atm/arpd/Makefile	Sat Apr 11 12:44:27 1998
+++ new/atm/arpd/Makefile	Fri Jun  5 18:29:45 1998
@@ -5,7 +5,7 @@
 OBJS=atmarpd.o arp.o io.o itf.o table.o
 BOOTPGMS=atmarp atmarpd
 MAN8=atmarp.8 atmarpd.8
-SYSHDR=atmarpd.h
+SYSHDR=atmarp.h atmarpd.h
 
 include ../Rules.make
 
diff -ur --new-file old/atm/arpd/arp.c new/atm/arpd/arp.c
--- old/atm/arpd/arp.c	Tue Apr 14 11:37:40 1998
+++ new/atm/arpd/arp.c	Sat Jun  6 01:13:53 1998
@@ -21,6 +21,7 @@
 
 #include "atm.h"
 #include "atmd.h"
+#include "atmarp.h"
 #include "atmarpd.h"
 
 #include "table.h"
diff -ur --new-file old/atm/arpd/arp.h new/atm/arpd/arp.h
--- old/atm/arpd/arp.h	Tue Apr 14 11:37:38 1998
+++ new/atm/arpd/arp.h	Sat Jun  6 01:18:43 1998
@@ -9,6 +9,7 @@
 #include <stdint.h>
 #include <linux/atmarp.h>
 
+#include "atmarp.h"
 #include "atmarpd.h"
 #include "table.h"
 
diff -ur --new-file old/atm/arpd/atmarp.c new/atm/arpd/atmarp.c
--- old/atm/arpd/atmarp.c	Wed Apr 15 19:42:41 1998
+++ new/atm/arpd/atmarp.c	Sat Jun  6 02:18:27 1998
@@ -15,7 +15,7 @@
 #include <netdb.h>
 #include <net/if_arp.h>
 
-#include <linux/atm.h>
+#include <stdint.h>
 #include <linux/atmarp.h>
 #include <linux/atmclip.h>
 
diff -ur --new-file old/atm/arpd/atmarp.h new/atm/arpd/atmarp.h
--- old/atm/arpd/atmarp.h	Thu Jan  1 01:00:00 1970
+++ new/atm/arpd/atmarp.h	Fri Jun  5 18:32:48 1998
@@ -0,0 +1,35 @@
+/* atmarp.h - ATM ARP protocol definitions */
+ 
+/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
+ 
+
+#ifndef _ATMARP_H
+#define _ATMARP_H
+
+#include <stdint.h>
+
+
+/* RFC 1577 ATM ARP header */
+
+struct atmarphdr {
+	uint16_t	ar_hrd;	/* Hardware type */
+	uint16_t	ar_pro;	/* Protocol type */
+	uint8_t		ar_shtl;/* Type & length of source ATM number (q) */
+	uint8_t		ar_sstl;/* Type & length of source ATM subaddress (r) */
+	uint16_t	ar_op;	/* Operation code (request, reply, or NAK) */
+	uint8_t		ar_spln;/* Length of source protocol address (s) */
+	uint8_t		ar_thtl;/* Type & length of target ATM number (x) */
+	uint8_t		ar_tstl;/* Type & length of target ATM subaddress (y) */
+	uint8_t		ar_tpln;/* Length of target protocol address (z) */
+	/* ar_sha, at_ssa, ar_spa, ar_tha, ar_tsa, ar_tpa */
+	unsigned char data[1];
+};
+
+#define	TL_LEN	0x3f	/* ATMARP Type/Length field structure */
+#define	TL_E164	0x40
+
+
+#define MAX_ATMARP_SIZE (sizeof(struct atmarphdr)-1+2*(ATM_E164_LEN+ \
+			ATM_ESA_LEN+4))
+
+#endif
diff -ur --new-file old/atm/arpd/atmarpd.c new/atm/arpd/atmarpd.c
--- old/atm/arpd/atmarpd.c	Sat Apr 11 12:22:12 1998
+++ new/atm/arpd/atmarpd.c	Sat Jun  6 02:20:20 1998
@@ -9,7 +9,6 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <linux/atmarp.h>
 
 #include "atm.h"
 #include "atmd.h"
diff -ur --new-file old/atm/atm.patch new/atm/atm.patch
--- old/atm/atm.patch	Thu Apr 23 21:22:22 1998
+++ new/atm/atm.patch	Sat Jun  6 04:17:11 1998
@@ -1,5 +1,14 @@
---- ref/Makefile	Fri Mar 27 02:39:46 1998
-+++ work/Makefile	Thu Mar 19 15:06:14 1998
+--- ref/Makefile	Thu May 21 04:10:21 1998
++++ work/Makefile	Sat Jun  6 03:32:39 1998
+@@ -11,7 +11,7 @@
+ #
+ # For UP operations COMMENT THIS OUT, simply setting SMP = 0 won't work
+ #
+-SMP = 1
++#SMP = 1
+ 
+ .EXPORT_ALL_VARIABLES:
+ 
 @@ -85,7 +85,7 @@
  # standard CFLAGS
  #
@@ -7,9 +16,9 @@
 -CFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
 +CFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -g
  
- ifdef CONFIG_CPP
- CFLAGS := $(CFLAGS) -x c++
-@@ -121,6 +121,10 @@
+ ifdef SMP
+ CFLAGS += -D__SMP__
+@@ -117,6 +117,10 @@
  
  DRIVERS := $(DRIVERS) drivers/net/net.a
  
@@ -20,7 +29,7 @@
  ifeq ($(CONFIG_SCSI),y)
  DRIVERS := $(DRIVERS) drivers/scsi/scsi.a
  endif
-@@ -318,6 +322,7 @@
+@@ -313,6 +317,7 @@
  	if [ -f NET_MODULES   ]; then inst_mod NET_MODULES   net;   fi; \
  	if [ -f IPV4_MODULES  ]; then inst_mod IPV4_MODULES  ipv4;  fi; \
  	if [ -f IPV6_MODULES  ]; then inst_mod IPV6_MODULES  ipv6;  fi; \
@@ -28,9 +37,9 @@
  	if [ -f SCSI_MODULES  ]; then inst_mod SCSI_MODULES  scsi;  fi; \
  	if [ -f FS_MODULES    ]; then inst_mod FS_MODULES    fs;    fi; \
  	if [ -f NLS_MODULES   ]; then inst_mod NLS_MODULES   fs;    fi; \
---- ref/Documentation/Configure.help	Fri Mar 27 02:39:46 1998
-+++ work/Documentation/Configure.help	Wed Mar 18 21:01:26 1998
-@@ -2237,6 +2237,79 @@
+--- ref/Documentation/Configure.help	Fri May 22 01:42:47 1998
++++ work/Documentation/Configure.help	Sat Jun  6 03:32:39 1998
+@@ -2657,6 +2657,79 @@
    This is a backward compatibility option, choose Y for now.
    This option will be removed soon.
  
@@ -109,17 +118,17 @@
 +
  SCSI support?
  CONFIG_SCSI
-   If you want to use a SCSI harddisk, SCSI tapedrive, SCSI CDROM or
+   If you want to use a SCSI hard disk, SCSI tape drive, SCSI CDROM or
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/Documentation/atm.txt	Wed Mar 18 21:01:26 1998
++++ work/Documentation/atm.txt	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,4 @@
 +In order to use anything but the most primitive functions of ATM,
 +several user-mode programs are required to assist the kernel. These
 +programs and related material can be found via the ATM on Linux Web
 +page at http://lrcwww.epfl.ch/linux-atm/
---- ref/arch/i386/config.in	Fri Mar 27 02:39:46 1998
-+++ work/arch/i386/config.in	Wed Mar 18 21:01:26 1998
-@@ -90,6 +90,9 @@
+--- ref/arch/i386/config.in	Wed Apr 29 07:41:33 1998
++++ work/arch/i386/config.in	Sat Jun  6 03:32:39 1998
+@@ -93,6 +93,9 @@
    bool 'Network device support' CONFIG_NETDEVICES
    if [ "$CONFIG_NETDEVICES" = "y" ]; then
      source drivers/net/Config.in
@@ -130,7 +139,7 @@
    endmenu
  fi
 --- ref/drivers/Makefile	Thu Dec  4 00:17:30 1997
-+++ work/drivers/Makefile	Wed Mar 18 21:01:26 1998
++++ work/drivers/Makefile	Sat Jun  6 03:32:39 1998
 @@ -9,7 +9,7 @@
  
  SUB_DIRS     := block char net misc #streams
@@ -153,7 +162,7 @@
  
  ifeq ($(CONFIG_AP1000),y)
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/Config.in	Wed Mar 18 21:01:27 1998
++++ work/drivers/atm/Config.in	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,23 @@
 +#
 +# ATM device configuration
@@ -179,7 +188,7 @@
 +#  tristate 'IDT 77201 (NICStAR)' CONFIG_ATM_NICSTAR y
 +fi
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/Makefile	Wed Mar 18 21:01:27 1998
++++ work/drivers/atm/Makefile	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,57 @@
 +# File: drivers/atm/Makefile
 +#
@@ -239,7 +248,7 @@
 +
 +include $(TOPDIR)/Rules.make
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/atmdev_init.c	Wed Mar 18 21:01:27 1998
++++ work/drivers/atm/atmdev_init.c	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,48 @@
 +/* drivers/atm/atmdev_init.c - ATM device driver initialization */
 + 
@@ -290,7 +299,7 @@
 +	return devs;
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/atmtcp.c	Thu Apr 16 13:44:31 1998
++++ work/drivers/atm/atmtcp.c	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,226 @@
 +/* drivers/atm/atmtcp.c - ATM over TCP "device" driver */
 +
@@ -519,8 +528,8 @@
 +	return dev->number;
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/eni.c	Thu Apr 16 12:23:07 1998
-@@ -0,0 +1,2146 @@
++++ work/drivers/atm/eni.c	Sat Jun  6 03:32:39 1998
+@@ -0,0 +1,2140 @@
 +/* drivers/atm/eni.c - Efficient Networks ENI155P device driver */
 + 
 +/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
@@ -530,7 +539,6 @@
 +#include <linux/config.h>
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
-+#include <linux/bios32.h>
 +#include <linux/pci.h>
 +#include <linux/errno.h>
 +#include <linux/atm.h>
@@ -1979,14 +1987,12 @@
 +
 +#define SET_SEPROM \
 +  ({ if (!error && !pci_error) { \
-+    pci_error = pcibios_write_config_byte(eni_dev->bus,eni_dev->dev_fn, \
-+      PCI_TONGA_CTRL,tonga); \
++    pci_error = pci_write_config_byte(eni_dev->pci_dev,PCI_TONGA_CTRL,tonga); \
 +    udelay(10); /* 10 usecs */ \
 +  } })
 +#define GET_SEPROM \
 +  ({ if (!error && !pci_error) { \
-+    pci_error = pcibios_read_config_byte(eni_dev->bus,eni_dev->dev_fn, \
-+      PCI_TONGA_CTRL,&tonga); \
++    pci_error = pci_read_config_byte(eni_dev->pci_dev,PCI_TONGA_CTRL,&tonga); \
 +    udelay(10); /* 10 usecs */ \
 +  } })
 +
@@ -2071,8 +2077,8 @@
 +		SET_SEPROM;
 +	}
 +	if (pci_error) {
-+		printk(KERN_ERR DEV_LABEL "(itf %d): error reading ESI (%s)\n",
-+		    dev->number,pcibios_strerror(pci_error));
++		printk(KERN_ERR DEV_LABEL "(itf %d): error reading ESI "
++		    "(0x%02x)\n",dev->number,pci_error);
 +		error = -EIO;
 +	}
 +	return error;
@@ -2111,23 +2117,22 @@
 +	dev->ci_range.vpi_bits = 0;
 +	dev->ci_range.vci_bits = NR_VCI_LD;
 +	eni_dev = ENI_DEV(dev);
-+	if ((error = pcibios_read_config_word(eni_dev->bus,eni_dev->dev_fn,
-+	    PCI_COMMAND,&command)) || (error = pcibios_read_config_dword(
-+	    eni_dev->bus,eni_dev->dev_fn,PCI_BASE_ADDRESS_0,&real_base)) ||
-+	    (error = pcibios_read_config_byte(eni_dev->bus,eni_dev->dev_fn,
-+	    PCI_INTERRUPT_LINE,&eni_dev->irq)) || (error =
-+	    pcibios_read_config_byte(eni_dev->bus,eni_dev->dev_fn,
++	if ((error = pci_read_config_word(eni_dev->pci_dev,PCI_COMMAND,
++	    &command)) || (error = pci_read_config_dword(eni_dev->pci_dev,
++	    PCI_BASE_ADDRESS_0,&real_base)) ||
++	    (error = pci_read_config_byte(eni_dev->pci_dev,PCI_INTERRUPT_LINE,
++	    &eni_dev->irq)) || (error = pci_read_config_byte(eni_dev->pci_dev,
 +	    PCI_REVISION_ID,&revision))) {
-+		printk(KERN_ERR DEV_LABEL "(itf %d): init error %s\n",
-+		    dev->number,pcibios_strerror(error));
++		printk(KERN_ERR DEV_LABEL "(itf %d): init error 0x%02x\n",
++		    dev->number,error);
 +		return -EINVAL;
 +	}
 +	real_base &= MEM_VALID; /* strip flags */
-+	if ((error = pcibios_write_config_word(eni_dev->bus,eni_dev->dev_fn,
-+	    PCI_COMMAND,PCI_COMMAND_MEMORY | (eni_dev->asic ?
-+	    PCI_COMMAND_PARITY | PCI_COMMAND_SERR : 0)))) {
-+		printk(KERN_ERR DEV_LABEL "(itf %d): can't enable memory (%s)"
-+		    "\n",dev->number,pcibios_strerror(error));
++	if ((error = pci_write_config_word(eni_dev->pci_dev,PCI_COMMAND,
++	    PCI_COMMAND_MEMORY |
++	    (eni_dev->asic ? PCI_COMMAND_PARITY | PCI_COMMAND_SERR : 0)))) {
++		printk(KERN_ERR DEV_LABEL "(itf %d): can't enable memory "
++		    "(0x%02x)\n",dev->number,error);
 +		return error;
 +	}
 +	printk(KERN_NOTICE DEV_LABEL "(itf %d): rev.%d,base=0x%x,irq=%d,",
@@ -2205,17 +2210,17 @@
 +		return -EAGAIN;
 +	}
 +	/* @@@ should release IRQ on error */
-+	if ((error = pcibios_write_config_word(eni_dev->bus,eni_dev->dev_fn,
-+	    PCI_COMMAND,PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
++	if ((error = pci_write_config_word(eni_dev->pci_dev,PCI_COMMAND,
++	    PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
 +	    (eni_dev->asic ? PCI_COMMAND_PARITY | PCI_COMMAND_SERR : 0)))) {
 +		printk(KERN_ERR DEV_LABEL "(itf %d): can't enable memory+"
-+		    "master (%s)\n",dev->number,pcibios_strerror(error));
++		    "master (0x%02x)\n",dev->number,error);
 +		return error;
 +	}
-+	if ((error = pcibios_write_config_byte(eni_dev->bus,eni_dev->dev_fn,
-+	    PCI_TONGA_CTRL,END_SWAP_DMA))) {
++	if ((error = pci_write_config_byte(eni_dev->pci_dev,PCI_TONGA_CTRL,
++	    END_SWAP_DMA))) {
 +		printk(KERN_ERR DEV_LABEL "(itf %d): can't set endian swap "
-+		    "(%s)\n",dev->number,pcibios_strerror(error));
++		    "(0x%02x)\n",dev->number,error);
 +		return error;
 +	}
 +	/* determine addresses of internal tables */
@@ -2597,21 +2602,19 @@
 +{
 +	struct atm_dev *dev;
 +	struct eni_dev *eni_dev;
-+	int devs,type,index;
++	int devs,type;
 +
-+	if (!pcibios_present()) {
-+		printk(KERN_ERR DEV_LABEL " driver but no PCI BIOS ?\n");
-+		return 0;
-+	}
 +	eni_dev = (struct eni_dev *) kmalloc(sizeof(struct eni_dev),
 +	    GFP_KERNEL);
 +	if (!eni_dev) return -ENOMEM;
 +	devs = 0;
 +	for (type = 0; type < 2; type++) {
-+		index = 0;
-+		while (!pcibios_find_device(PCI_VENDOR_ID_EF,type ?
++		struct pci_dev *pci_dev;
++
++		pci_dev = NULL;
++		while ((pci_dev = pci_find_device(PCI_VENDOR_ID_EF,type ?
 +		    PCI_DEVICE_ID_EF_ATM_ASIC : PCI_DEVICE_ID_EF_ATM_FPGA,
-+		    index,&eni_dev->bus,&eni_dev->dev_fn)) {
++		    pci_dev))) {
 +			if (!devs) {
 +				zeroes = kmalloc(4,GFP_KERNEL);
 +				if (!zeroes) {
@@ -2621,6 +2624,7 @@
 +			}
 +			dev = atm_dev_register(DEV_LABEL,&ops,-1,0);
 +			if (!dev) break;
++			eni_dev->pci_dev = pci_dev;
 +			ENI_DEV(dev) = eni_dev;
 +			eni_dev->asic = type;
 +			if (eni_init(dev) || eni_start(dev)) {
@@ -2629,7 +2633,6 @@
 +			}
 +			eni_dev->more = eni_boards;
 +			eni_boards = dev;
-+			index++;
 +			devs++;
 +			eni_dev = (struct eni_dev *) kmalloc(sizeof(struct
 +			    eni_dev),GFP_KERNEL);
@@ -2668,7 +2671,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/eni.h	Thu Apr 16 13:37:25 1998
++++ work/drivers/atm/eni.h	Sat Jun  6 03:51:07 1998
 @@ -0,0 +1,114 @@
 +/* drivers/atm/eni.h - Efficient Networks ENI155P device driver declarations */
 + 
@@ -2683,6 +2686,7 @@
 +#include <linux/sonet.h>
 +#include <linux/skbuff.h>
 +#include <linux/time.h>
++#include <linux/pci.h>
 +
 +#include "midway.h"
 +
@@ -2766,8 +2770,7 @@
 +	int mem;			/* RAM on board (in bytes) */
 +	int asic;			/* PCI interface type, 0 for FPGA */
 +	unsigned char irq;		/* IRQ */
-+	unsigned char bus;		/* PCI stuff */
-+	unsigned char dev_fn;
++	struct pci_dev *pci_dev;	/* PCI stuff */
 +};
 +
 +
@@ -2785,7 +2788,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/midway.h	Wed Mar 18 21:01:27 1998
++++ work/drivers/atm/midway.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,265 @@
 +/* drivers/atm/midway.h - Efficient Networks Midway (SAR) description */
 + 
@@ -3053,7 +3056,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/suni.c	Wed Mar 18 21:01:27 1998
++++ work/drivers/atm/suni.c	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,301 @@
 +/* drivers/atm/suni.c - PMC SUNI (PHY) driver */
 + 
@@ -3357,7 +3360,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/suni.h	Thu Apr 16 13:37:20 1998
++++ work/drivers/atm/suni.h	Sat Jun  6 03:51:05 1998
 @@ -0,0 +1,219 @@
 +/* drivers/atm/suni.h - PMC SUNI (PHY) declarations */
 + 
@@ -3579,7 +3582,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/tonga.h	Wed Mar 18 21:01:27 1998
++++ work/drivers/atm/tonga.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,20 @@
 +/* drivers/atm/tonga.h - Efficient Networks Tonga (PCI bridge) declarations */
 + 
@@ -3602,7 +3605,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/uPD98401.h	Wed Mar 18 21:01:27 1998
++++ work/drivers/atm/uPD98401.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,292 @@
 +/* drivers/atm/uPD98401.h - NEC uPD98401 (SAR) declarations */
 + 
@@ -3897,7 +3900,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/uPD98402.c	Wed Mar 18 21:01:27 1998
++++ work/drivers/atm/uPD98402.c	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,224 @@
 +/* drivers/atm/uPD98402.c - NEC uPD98402 (PHY) declarations */
 + 
@@ -4124,7 +4127,7 @@
 + 
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/uPD98402.h	Wed Mar 18 21:01:27 1998
++++ work/drivers/atm/uPD98402.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,106 @@
 +/* drivers/atm/uPD98402.h - NEC uPD98402 (PHY) declarations */
 + 
@@ -4233,8 +4236,8 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/zatm.c	Thu Apr 16 12:23:15 1998
-@@ -0,0 +1,1870 @@
++++ work/drivers/atm/zatm.c	Sat Jun  6 03:32:39 1998
+@@ -0,0 +1,1865 @@
 +/* drivers/atm/zatm.c - ZeitNet ZN122x device driver */
 + 
 +/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
@@ -4244,7 +4247,6 @@
 +#include <linux/sched.h>
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
-+#include <linux/bios32.h>
 +#include <linux/pci.h>
 +#include <linux/errno.h>
 +#include <linux/atm.h>
@@ -5520,10 +5522,9 @@
 +{
 +	int error;
 +
-+	if ((error = pcibios_write_config_dword(zatm_dev->bus,zatm_dev->dev_fn,
-+	    cmd,value)))
-+		printk(KERN_ERR DEV_LABEL ": PCI write failed (%s)\n",
-+		    pcibios_strerror(error));
++	if ((error = pci_write_config_dword(zatm_dev->pci_dev,cmd,value)))
++		printk(KERN_ERR DEV_LABEL ": PCI write failed (0x%02x)\n",
++		    error);
 +}
 +
 +
@@ -5533,10 +5534,9 @@
 +	unsigned int value;
 +	int error;
 +
-+	if ((error = pcibios_read_config_dword(zatm_dev->bus,zatm_dev->dev_fn,
-+	    cmd,&value)))
-+		printk(KERN_ERR DEV_LABEL ": PCI read failed (%s)\n",
-+		    pcibios_strerror(error));
++	if ((error = pci_read_config_dword(zatm_dev->pci_dev,cmd,&value)))
++		printk(KERN_ERR DEV_LABEL ": PCI read failed (0x%02x)\n",
++		    error);
 +	return value;
 +}
 +
@@ -5613,22 +5613,22 @@
 +
 +	DPRINTK(">zatm_init\n");
 +	zatm_dev = ZATM_DEV(dev);
-+	if ((error = pcibios_read_config_word(zatm_dev->bus,zatm_dev->dev_fn,
-+	    PCI_COMMAND,&command)) || (error = pcibios_read_config_dword(
-+	    zatm_dev->bus,zatm_dev->dev_fn,PCI_BASE_ADDRESS_0,&zatm_dev->base))
-+	    || (error = pcibios_read_config_byte(zatm_dev->bus,zatm_dev->dev_fn,
-+	    PCI_INTERRUPT_LINE,&zatm_dev->irq)) || (error =
-+	    pcibios_read_config_byte(zatm_dev->bus,zatm_dev->dev_fn,
-+	    PCI_REVISION_ID,&revision))) {
-+		printk(KERN_ERR DEV_LABEL "(itf %d): init error %s\n",
-+		    dev->number,pcibios_strerror(error));
++	if ((error = pci_read_config_word(zatm_dev->pci_dev,PCI_COMMAND,
++	    &command)) || (error = pci_read_config_dword(zatm_dev->pci_dev,
++	    PCI_BASE_ADDRESS_0,&zatm_dev->base)) ||
++	    (error = pci_read_config_byte(zatm_dev->pci_dev,PCI_INTERRUPT_LINE,
++	    &zatm_dev->irq)) ||
++	    (error = pci_read_config_byte(zatm_dev->pci_dev,PCI_REVISION_ID,
++	    &revision))) {
++		printk(KERN_ERR DEV_LABEL "(itf %d): init error 0x%02x\n",
++		    dev->number,error);
 +		return -EINVAL;
 +	}
 +	zatm_dev->base &= PCI_BASE_ADDRESS_IO_MASK;
-+	if ((error = pcibios_write_config_word(zatm_dev->bus,zatm_dev->dev_fn,
-+	    PCI_COMMAND,command | PCI_COMMAND_IO | PCI_COMMAND_MASTER))) {
-+		printk(KERN_ERR DEV_LABEL "(itf %d): can't enable IO (%s)\n",
-+		    dev->number,pcibios_strerror(error));
++	if ((error = pci_write_config_word(zatm_dev->pci_dev,PCI_COMMAND,
++	    command | PCI_COMMAND_IO | PCI_COMMAND_MASTER))) {
++		printk(KERN_ERR DEV_LABEL "(itf %d): can't enable IO (0x%02x)"
++		    "\n",dev->number,error);
 +		return error;
 +	}
 +	eprom_get_esi(dev);
@@ -6047,23 +6047,22 @@
 +{
 +	struct atm_dev *dev;
 +	struct zatm_dev *zatm_dev;
-+	int devs,type,index;
++	int devs,type;
 +
-+	if (!pcibios_present()) {
-+		printk(KERN_ERR DEV_LABEL " driver but no PCI BIOS ?\n");
-+		return 0;
-+	}
 +	zatm_dev = (struct zatm_dev *) kmalloc(sizeof(struct zatm_dev),
 +	    GFP_KERNEL);
 +	if (!zatm_dev) return -ENOMEM;
 +	devs = 0;
 +	for (type = 0; type < 2; type++) {
-+		index = 0;
-+		while (!pcibios_find_device(PCI_VENDOR_ID_ZEITNET,type ?
++		struct pci_dev *pci_dev;
++
++		pci_dev = NULL;
++		while ((pci_dev = pci_find_device(PCI_VENDOR_ID_ZEITNET,type ?
 +		    PCI_DEVICE_ID_ZEITNET_1225 : PCI_DEVICE_ID_ZEITNET_1221,
-+		    index,&zatm_dev->bus,&zatm_dev->dev_fn)) {
++		    pci_dev))) {
 +			dev = atm_dev_register(DEV_LABEL,&ops,-1,0);
 +			if (!dev) break;
++			zatm_dev->pci_dev = pci_dev;
 +			ZATM_DEV(dev) = zatm_dev;
 +			zatm_dev->copper = type;
 +			if (zatm_init(dev) || zatm_start(dev)) {
@@ -6072,7 +6071,6 @@
 +			}
 +			zatm_dev->more = zatm_boards;
 +			zatm_boards = dev;
-+			index++;
 +			devs++;
 +			zatm_dev = (struct zatm_dev *) kmalloc(sizeof(struct
 +			    zatm_dev),GFP_KERNEL);
@@ -6106,7 +6104,7 @@
 + 
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/zatm.h	Thu Apr 16 13:37:29 1998
++++ work/drivers/atm/zatm.h	Sat Jun  6 03:51:10 1998
 @@ -0,0 +1,136 @@
 +/* drivers/atm/zatm.h - ZeitNet ZN122x device driver declarations */
 +
@@ -6120,6 +6118,7 @@
 +#include <linux/atm.h>
 +#include <linux/atmdev.h>
 +#include <linux/sonet.h>
++#include <linux/pci.h>
 +
 +
 +#define DEV_LABEL	"zatm"
@@ -6228,8 +6227,7 @@
 +	int copper;			/* PHY type */
 +	unsigned char irq;		/* IRQ */
 +	unsigned int base;		/* IO base address */
-+	unsigned char bus;		/* PCI stuff */
-+	unsigned char dev_fn;
++	struct pci_dev *pci_dev;	/* PCI stuff */
 +};
 +
 +
@@ -6245,7 +6243,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/drivers/atm/zeprom.h	Wed Mar 18 21:01:27 1998
++++ work/drivers/atm/zeprom.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,34 @@
 +/* drivers/atm/zeprom.h - ZeitNet ZN122x EEPROM (NM93C46) declarations */
 +
@@ -6282,7 +6280,7 @@
 +
 +#endif
 --- ref/drivers/block/genhd.c	Fri Feb  6 19:29:22 1998
-+++ work/drivers/block/genhd.c	Wed Mar 18 21:01:27 1998
++++ work/drivers/block/genhd.c	Sat Jun  6 03:32:39 1998
 @@ -58,6 +58,7 @@
  extern int blk_dev_init(void);
  extern int scsi_dev_init(void);
@@ -6302,17 +6300,16 @@
  #ifdef CONFIG_VT
  	console_map_init();
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/arequipa.h	Tue Apr 14 17:02:26 1998
++++ work/include/linux/arequipa.h	Sat Jun  6 03:55:27 1998
 @@ -0,0 +1,63 @@
 +/* arequipa.h - Arequipa interface definitions */
 + 
-+/* Written 1996,1997 by Jean-Michel Pittet and Werner Almesberger, EPFL LRC */
++/* Written 1996-1998 by Jean-Michel Pittet and Werner Almesberger, EPFL ICA */
 + 
 +
 +#ifndef _LINUX_AREQUIPA_H
 +#define _LINUX_AREQUIPA_H
 +
-+#include <linux/atm.h>
 +#include <linux/atmioc.h>
 +
 +
@@ -6342,6 +6339,7 @@
 +#include <linux/netdevice.h>
 +#include <linux/inetdevice.h>
 +#include <linux/ip.h>
++#include <linux/atm.h>
 +#include <net/sock.h>
 +
 +
@@ -6368,8 +6366,8 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atm.h	Tue Apr 14 13:39:34 1998
-@@ -0,0 +1,233 @@
++++ work/include/linux/atm.h	Sat Jun  6 03:32:39 1998
+@@ -0,0 +1,235 @@
 +/* atm.h - general ATM declarations */
 + 
 +/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
@@ -6383,8 +6381,10 @@
 + * documentation. Do not change them.
 + */
 +
++#ifdef __KERNEL__
 +#include <linux/socket.h>
-+#include <linux/atm_stdint.h>
++#include <linux/types.h>
++#endif
 +#include <linux/atmsap.h>
 +#include <linux/atmioc.h>
 +
@@ -6604,7 +6604,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atm_eni.h	Wed Mar 18 21:01:27 1998
++++ work/include/linux/atm_eni.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,15 @@
 +/* atm_eni.h - Driver-specific declarations of the ENI driver (for use by
 +	       driver-specific utilities) */
@@ -6622,24 +6622,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atm_stdint.h	Wed Mar 18 23:23:45 1998
-@@ -0,0 +1,14 @@
-+/* atm_stdint.h - work-around until kernel and glibc are in sync again */
-+ 
-+/* Hacked 1998 by Werner Almesberger, EPFL ICA */
-+ 
-+
-+#if !defined(_LINUX_ATM_STDINT_H) && !defined(_STDINT_H)
-+#define _LINUX_ATM_STDINT_H
-+#define _STDINT_H
-+
-+typedef unsigned char uint8_t;
-+typedef unsigned short uint16_t;
-+typedef unsigned int uint32_t;
-+
-+#endif
---- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atm_tcp.h	Thu Apr 16 12:22:44 1998
++++ work/include/linux/atm_tcp.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,30 @@
 +/* atm_tcp.h - Driver-specific declarations of the ATMTCP driver (for use by
 +	       driver-specific utilities) */
@@ -6650,7 +6633,7 @@
 +#ifndef LINUX_ATM_TCP_H
 +#define LINUX_ATM_TCP_H
 +
-+#include <linux/atm_stdint.h>
++#include <linux/types.h>
 +
 +
 +/*
@@ -6672,7 +6655,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atm_zatm.h	Wed Mar 18 21:01:27 1998
++++ work/include/linux/atm_zatm.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,54 @@
 +/* atm_zatm.h - Driver-specific declarations of the ZATM driver (for use by
 +		driver-specific utilities) */
@@ -6729,8 +6712,8 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atmarp.h	Tue Apr 14 17:02:16 1998
-@@ -0,0 +1,64 @@
++++ work/include/linux/atmarp.h	Sat Jun  6 03:34:36 1998
+@@ -0,0 +1,42 @@
 +/* atmarp.h - ATM ARP protocol and kernel-demon interface definitions */
 + 
 +/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
@@ -6739,34 +6722,12 @@
 +#ifndef _LINUX_ATMARP_H
 +#define _LINUX_ATMARP_H
 +
-+#include <linux/atm_stdint.h>
-+#include <linux/atm.h>
++#ifdef __KERNEL__
++#include <linux/types.h>
++#endif
 +#include <linux/atmioc.h>
 +
 +
-+/* RFC 1577 ATM ARP header */
-+
-+struct atmarphdr {
-+	unsigned short	ar_hrd;	/* Hardware type */
-+	unsigned short	ar_pro;	/* Protocol type */
-+	unsigned char	ar_shtl;/* Type & length of source ATM number (q) */
-+	unsigned char	ar_sstl;/* Type & length of source ATM subaddress (r) */
-+	unsigned short	ar_op;	/* Operation code (request, reply, or NAK) */
-+	unsigned char	ar_spln;/* Length of source protocol address (s) */
-+	unsigned char	ar_thtl;/* Type & length of target ATM number (x) */
-+	unsigned char	ar_tstl;/* Type & length of target ATM subaddress (y) */
-+	unsigned char	ar_tpln;/* Length of target protocol address (z) */
-+	/* ar_sha, at_ssa, ar_spa, ar_tha, ar_tsa, ar_tpa */
-+	unsigned char data[1];
-+};
-+
-+#define	TL_LEN	0x3f	/* ATMARP Type/Length field structure */
-+#define	TL_E164	0x40
-+
-+
-+#define MAX_ATMARP_SIZE (sizeof(struct atmarphdr)-1+2*(ATM_E164_LEN+ \
-+			ATM_ESA_LEN+4))
-+
 +#define ATMARP_RETRY_DELAY 30		/* request next resolution or forget
 +					   NAK after 30 sec - should go into
 +					   atmclip.h */
@@ -6796,7 +6757,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atmclip.h	Wed Mar 18 21:01:27 1998
++++ work/include/linux/atmclip.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,21 @@
 +/* atmclip.h - Classical IP over ATM */
 + 
@@ -6820,7 +6781,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atmdev.h	Thu Apr 16 12:22:11 1998
++++ work/include/linux/atmdev.h	Sat Jun  6 03:51:05 1998
 @@ -0,0 +1,304 @@
 +/* atmdev.h - ATM device driver declarations */
 + 
@@ -6832,9 +6793,7 @@
 +
 +
 +#include <linux/config.h>
-+#include <linux/uio.h>
 +#include <linux/atmioc.h>
-+#include <asm/atomic.h>
 +
 +
 +#define ESI_LEN		6
@@ -6938,6 +6897,8 @@
 +#include <linux/net.h>
 +#include <linux/skbuff.h> /* struct sk_buff */
 +#include <linux/atm.h>
++#include <linux/uio.h>
++#include <asm/atomic.h>
 +
 +#ifdef CONFIG_PROC_FS
 +#include <linux/proc_fs.h>
@@ -7127,7 +7088,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atmioc.h	Wed Mar 18 21:01:27 1998
++++ work/include/linux/atmioc.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,38 @@
 +/* atmioc.h - ranges for ATM-related ioctl numbers */
 + 
@@ -7168,7 +7129,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atmlec.h	Tue Apr 14 17:02:26 1998
++++ work/include/linux/atmlec.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,65 @@
 +/*
 + * 
@@ -7236,7 +7197,7 @@
 +};
 +#endif /* _ATMLEC_H_ */
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atmsap.h	Wed Mar 18 21:01:27 1998
++++ work/include/linux/atmsap.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,161 @@
 +/* atmsap.h - ATM Service Access Point addressing definitions */
 +
@@ -7400,7 +7361,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/atmsvc.h	Tue Apr 14 17:02:27 1998
++++ work/include/linux/atmsvc.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,52 @@
 +/* atmsvc.h - ATM signaling kernel-demon interface definitions */
 + 
@@ -7454,8 +7415,8 @@
 +  (tp).max_pcr : (tp).min_pcr ? (tp).min_pcr : ATM_MAX_PCR)
 +
 +#endif
---- ref/include/linux/if_arp.h	Sat Mar  7 06:03:10 1998
-+++ work/include/linux/if_arp.h	Thu Apr 23 22:21:30 1998
+--- ref/include/linux/if_arp.h	Fri Jun  5 08:31:46 1998
++++ work/include/linux/if_arp.h	Sat Jun  6 03:49:05 1998
 @@ -35,6 +35,7 @@
  #define	ARPHRD_ARCNET	7		/* ARCnet			*/
  #define	ARPHRD_APPLETLK	8		/* APPLEtalk			*/
@@ -7464,7 +7425,7 @@
  #define ARPHRD_METRICOM	23		/* Metricom STRIP (new IANA id)	*/
  
  /* Dummy types for non ARP hardware */
-@@ -70,6 +71,9 @@
+@@ -71,6 +72,9 @@
  #define	ARPOP_REPLY	2		/* ARP reply			*/
  #define	ARPOP_RREQUEST	3		/* RARP request			*/
  #define	ARPOP_RREPLY	4		/* RARP reply			*/
@@ -7474,9 +7435,9 @@
  
  
  /* ARP ioctl request. */
---- ref/include/linux/skbuff.h	Sat Mar  7 06:02:21 1998
-+++ work/include/linux/skbuff.h	Thu Apr 23 22:20:05 1998
-@@ -117,6 +117,20 @@
+--- ref/include/linux/skbuff.h	Fri Jun  5 08:31:06 1998
++++ work/include/linux/skbuff.h	Sat Jun  6 03:47:40 1998
+@@ -106,6 +106,20 @@
  	__u32		shapestamp;		/* Stamp for shaper    */
  	__u16		shapepend;		/* Pending */
  #endif
@@ -7497,53 +7458,8 @@
  };
  
  /* These are just the default values. This is run time configurable.
---- ref/include/linux/socket.h	Fri Mar 27 02:39:52 1998
-+++ work/include/linux/socket.h	Thu Apr 23 22:19:50 1998
-@@ -138,7 +138,7 @@
- #define AF_APPLETALK	5	/* Appletalk DDP 		*/
- #define AF_NETROM	6	/* Amateur Radio NET/ROM 	*/
- #define AF_BRIDGE	7	/* Multiprotocol bridge 	*/
--#define AF_AAL5		8	/* Reserved for Werner's ATM 	*/
-+#define AF_ATMPVC	8	/* ATM PVCs			*/
- #define AF_X25		9	/* Reserved for X.25 project 	*/
- #define AF_INET6	10	/* IP version 6			*/
- #define AF_ROSE		11	/* Amateur Radio X.25 PLP	*/
-@@ -150,6 +150,7 @@
- #define AF_ROUTE	AF_NETLINK /* Alias to emulate 4.4BSD */
- #define AF_PACKET	17	/* Packet family		*/
- #define AF_ASH		18	/* Ash				*/
-+#define AF_ATMSVC	20	/* ATM SVCs			*/
- #define AF_MAX		32	/* For now.. */
- 
- /* Protocol families, same as address families. */
-@@ -162,7 +163,7 @@
- #define PF_APPLETALK	AF_APPLETALK
- #define	PF_NETROM	AF_NETROM
- #define PF_BRIDGE	AF_BRIDGE
--#define PF_AAL5		AF_AAL5
-+#define PF_ATMPVC	AF_ATMPVC
- #define PF_X25		AF_X25
- #define PF_INET6	AF_INET6
- #define PF_ROSE		AF_ROSE
-@@ -174,6 +175,7 @@
- #define PF_ROUTE	AF_ROUTE
- #define PF_PACKET	AF_PACKET
- #define PF_ASH		AF_ASH
-+#define PF_ATMSVC	AF_ATMSVC
- 
- #define PF_MAX		AF_MAX
- 
-@@ -220,6 +222,8 @@
- #define SOL_DECNET	261
- #define	SOL_X25		262
- #define SOL_PACKET	263
-+#define SOL_ATM		264	/* ATM layer (cell level) */
-+#define SOL_AAL		265	/* ATM Adaption Layer (packet level) */
- 
- /* IPX options */
- #define IPX_TYPE	1
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/linux/sonet.h	Wed Mar 18 21:01:27 1998
++++ work/include/linux/sonet.h	Sat Jun  6 03:32:39 1998
 @@ -0,0 +1,52 @@
 +/* sonet.h - SONET/SHD physical layer control */
 + 
@@ -7598,7 +7514,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/include/net/atmclip.h	Thu Apr 16 13:37:43 1998
++++ work/include/net/atmclip.h	Sat Jun  6 03:54:41 1998
 @@ -0,0 +1,62 @@
 +/* net/atm/atmarp.h - RFC1577 ATM ARP */
 + 
@@ -7662,8 +7578,8 @@
 +int clip_encap(struct atm_vcc *vcc,int mode);
 +
 +#endif
---- ref/net/Config.in	Thu Feb 19 23:46:15 1998
-+++ work/net/Config.in	Wed Mar 18 21:01:27 1998
+--- ref/net/Config.in	Tue Apr 28 20:10:10 1998
++++ work/net/Config.in	Sat Jun  6 03:32:39 1998
 @@ -23,6 +23,20 @@
      fi
    fi
@@ -7686,7 +7602,7 @@
  comment ' '
  tristate 'The IPX protocol' CONFIG_IPX
 --- ref/net/Makefile	Sun Nov 30 23:00:39 1997
-+++ work/net/Makefile	Wed Mar 18 21:01:27 1998
++++ work/net/Makefile	Sat Jun  6 03:32:39 1998
 @@ -9,7 +9,8 @@
  
  MOD_SUB_DIRS := ipv4
@@ -7712,7 +7628,7 @@
  
  ifeq ($(CONFIG_DECNET),y)
 --- ref/net/protocols.c	Sun Nov 30 23:00:40 1997
-+++ work/net/protocols.c	Wed Mar 18 21:01:27 1998
++++ work/net/protocols.c	Sat Jun  6 03:32:39 1998
 @@ -79,6 +79,10 @@
  extern void rif_init(struct net_proto *);
  #endif
@@ -7736,8 +7652,8 @@
  
  #ifdef NEED_LLC
    { "802.2LLC", llc_init },				/* 802.2 LLC */
---- ref/net/ipv4/arp.c	Fri Mar 27 02:39:54 1998
-+++ work/net/ipv4/arp.c	Thu Apr  9 17:28:02 1998
+--- ref/net/ipv4/arp.c	Thu May 14 19:26:23 1998
++++ work/net/ipv4/arp.c	Sat Jun  6 03:32:39 1998
 @@ -115,6 +115,9 @@
  #include <net/netrom.h>
  #endif
@@ -7762,7 +7678,7 @@
  }
  
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/Makefile	Wed Mar 18 21:01:27 1998
++++ work/net/atm/Makefile	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,52 @@
 +#
 +# Makefile for the ATM Protocol Families.
@@ -7817,7 +7733,7 @@
 +
 +include $(TOPDIR)/Rules.make
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/addr.c	Wed Mar 18 21:01:27 1998
++++ work/net/atm/addr.c	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,159 @@
 +/* net/atm/addr.c - Local ATM address registry */
 +
@@ -7979,7 +7895,7 @@
 +	return total;
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/addr.h	Thu Apr 16 13:37:52 1998
++++ work/net/atm/addr.h	Sat Jun  6 03:55:27 1998
 @@ -0,0 +1,18 @@
 +/* net/atm/addr.h - Local ATM address registry */
 +
@@ -8000,8 +7916,8 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/clip.c	Tue Apr 14 13:09:44 1998
-@@ -0,0 +1,643 @@
++++ work/net/atm/clip.c	Sat Jun  6 03:32:40 1998
+@@ -0,0 +1,645 @@
 +/* clip.c - RFC1577 Classical IP over ATM */
 +
 +/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
@@ -8021,12 +7937,10 @@
 +#include <linux/atmclip.h>
 +#include <linux/atmarp.h>
 +#include <linux/ip.h> /* for net/route.h */
-+/* #include <linux/inetdevice.h> / * for net/route.h  WAS IN 2155-VGER */
 +#include <linux/in.h> /* for struct sockaddr_in */
 +#include <linux/if.h> /* for IFF_UP */
 +#include <linux/inetdevice.h>
 +#include <net/route.h> /* for struct rtable and routing */
-+#include <net/ip.h> /* ip_acct_output, etc. */
 +#include <net/icmp.h> /* icmp_send */
 +#include <asm/param.h> /* for HZ */
 +#include <asm/byteorder.h> /* for htons etc. */
@@ -8251,10 +8165,10 @@
 +	clip_neigh_destroy,	/* destructor */
 +	clip_neigh_solicit,	/* solicit */
 +	clip_neigh_error,	/* error_report */
-+	ip_acct_output,		/* output */
-+	ip_acct_output,		/* connected_output */
-+	ip_acct_output,		/* hh_output */
-+	ip_acct_output		/* queue_xmit */
++	dev_queue_xmit,		/* output */
++	dev_queue_xmit,		/* connected_output */
++	dev_queue_xmit,		/* hh_output */
++	dev_queue_xmit		/* queue_xmit */
 +};
 +
 +
@@ -8482,9 +8396,10 @@
 +	DPRINTK("clip_init %s\n",dev->name);
 +	dev->hard_start_xmit = clip_start_xmit;
 +	/* sg_xmit ... */
-+	ether_setup(dev);
 +	dev->hard_header = NULL;
 +	dev->rebuild_header = NULL;
++	dev->set_mac_address = NULL;
++	dev->hard_header_parse = NULL;
 +	dev->hard_header_cache = NULL;
 +	dev->header_cache_update = NULL;
 +	dev->change_mtu = NULL;
@@ -8492,8 +8407,11 @@
 +	dev->get_stats = clip_get_stats;
 +	dev->type = ARPHRD_ATM;
 +	dev->hard_header_len = RFC1483LLC_LEN;
-+	dev->flags &= ~(IFF_BROADCAST | IFF_MULTICAST);
 +	dev->mtu = RFC1626_MTU;
++	dev->addr_len = 0;
++	dev->tx_queue_len = 0;
++	dev->flags = 0;
++	dev_init_buffers(dev); /* is this ever supposed to be used ? */
 +	return 0;
 +}
 +
@@ -8646,7 +8564,7 @@
 +	return 0;
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/common.c	Thu Apr 16 12:23:43 1998
++++ work/net/atm/common.c	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,903 @@
 +/* net/atm/common.c - ATM sockets (common part for PVC and SVC) */
 +
@@ -9552,7 +9470,7 @@
 +	return atm_do_getsockopt(sock,level,optname,optval,len);
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/common.h	Sun Apr 12 18:44:59 1998
++++ work/net/atm/common.h	Sat Jun  6 03:55:27 1998
 @@ -0,0 +1,44 @@
 +/* net/atm/common.h - ATM sockets (common part for PVC and SVC) */
 + 
@@ -9599,7 +9517,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/ipcommon.c	Wed Mar 18 21:01:27 1998
++++ work/net/atm/ipcommon.c	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,52 @@
 +/* net/atm/ipcommon.c - Common items for all ways of doing IP over ATM */
 +
@@ -9654,7 +9572,7 @@
 +	skb_queue_head_init(from);
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/ipcommon.h	Thu Apr 16 13:38:07 1998
++++ work/net/atm/ipcommon.h	Sat Jun  6 03:55:37 1998
 @@ -0,0 +1,23 @@
 +/* net/atm/ipcommon.h - Common items for all ways of doing IP over ATM */
 +
@@ -9680,7 +9598,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/misc.c	Wed Mar 18 21:01:27 1998
++++ work/net/atm/misc.c	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,187 @@
 +/* net/atm/misc.c - Various functions for use by ATM drivers */
 +
@@ -9870,7 +9788,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/lec.c	Wed Mar 18 21:19:34 1998
++++ work/net/atm/lec.c	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,1895 @@
 +/*
 + * lec.c: Lan Emulation driver 
@@ -11768,7 +11686,7 @@
 +}
 +
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/lec.h	Thu Apr 16 13:37:52 1998
++++ work/net/atm/lec.h	Sat Jun  6 03:55:27 1998
 @@ -0,0 +1,112 @@
 +/*
 + *
@@ -11883,7 +11801,7 @@
 +#endif _LEC_H_
 +
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/lec_arpc.h	Thu Apr 16 13:37:52 1998
++++ work/net/atm/lec_arpc.h	Sat Jun  6 03:55:27 1998
 @@ -0,0 +1,112 @@
 +/*
 + * Lec arp cache
@@ -11998,7 +11916,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/proc.c	Tue Apr 14 13:11:23 1998
++++ work/net/atm/proc.c	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,607 @@
 +/* net/atm/proc.c - ATM /proc interface */
 +
@@ -12608,7 +12526,7 @@
 +	return error;
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/protocols.h	Wed Mar 18 21:01:27 1998
++++ work/net/atm/protocols.h	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,16 @@
 +/* net/atm/protocols.h - ATM protocol handler entry points */
 +
@@ -12627,7 +12545,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/pvc.c	Wed Mar 18 21:01:27 1998
++++ work/net/atm/pvc.c	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,157 @@
 +/* net/atm/pvc.c - ATM PVC sockets */
 +
@@ -12787,7 +12705,7 @@
 +#endif
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/raw.c	Wed Mar 18 21:10:47 1998
++++ work/net/atm/raw.c	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,80 @@
 +/* net/atm/raw.c - Raw AAL0 and AAL5 transports */
 +
@@ -12870,7 +12788,7 @@
 +	return 0;
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/resources.c	Thu Apr 16 13:44:13 1998
++++ work/net/atm/resources.c	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,183 @@
 +/* net/atm/resources.c - Staticly allocated resources */
 +
@@ -13056,7 +12974,7 @@
 +	}
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/resources.h	Thu Apr 16 13:37:52 1998
++++ work/net/atm/resources.h	Sat Jun  6 03:55:27 1998
 @@ -0,0 +1,29 @@
 +/* net/atm/resources.h - ATM-related resources */
 +
@@ -13088,7 +13006,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/signaling.c	Wed Mar 18 21:10:56 1998
++++ work/net/atm/signaling.c	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,253 @@
 +/* net/atm/signaling.c - ATM signaling */
 +
@@ -13344,7 +13262,7 @@
 +	return 0;
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/signaling.h	Thu Apr 16 13:37:52 1998
++++ work/net/atm/signaling.h	Sat Jun  6 03:55:27 1998
 @@ -0,0 +1,25 @@
 +/* net/atm/signaling.h - ATM signaling */
 + 
@@ -13372,7 +13290,7 @@
 +
 +#endif
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/svc.c	Wed Mar 18 21:11:03 1998
++++ work/net/atm/svc.c	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,384 @@
 +/* net/atm/svc.c - ATM SVC sockets */
 +
@@ -13759,7 +13677,7 @@
 +	}
 +}
 --- /dev/null	Tue Jan  1 05:00:00 1980
-+++ work/net/atm/tunable.h	Wed Mar 18 21:01:27 1998
++++ work/net/atm/tunable.h	Sat Jun  6 03:32:40 1998
 @@ -0,0 +1,26 @@
 +/* net/atm/tunable.h - Tunable parameters of ATM support */
 +
@@ -13787,24 +13705,25 @@
 +				   quota per PDU */
 +
 +#endif
---- ref/net/core/skbuff.c	Wed Feb 25 07:08:02 1998
-+++ work/net/core/skbuff.c	Wed Mar 18 21:01:27 1998
-@@ -186,6 +186,12 @@
- 	skb->end = bptr + len;
- 	skb->len = 0;
- 	skb->inclone = 0;
+--- ref/net/core/skbuff.c	Thu May 14 19:26:22 1998
++++ work/net/core/skbuff.c	Sat Jun  6 03:32:40 1998
+@@ -149,6 +149,13 @@
+ 	skb->is_clone = 0;
+ 	skb->cloned = 0;
+ 
 +#ifdef CONFIG_ATM
 +	skb->atm.iovcnt = 0;
 +#ifdef CONFIG_ATM_NICSTAR
 +	skb->atm.recycle_buffer = NULL;
 +#endif
 +#endif
++
+ 	atomic_set(&skb->users, 1); 
+ 	atomic_set(skb_datarefp(skb), 1);
  	return skb;
- }
- 
-@@ -255,6 +261,9 @@
+@@ -241,6 +248,9 @@
+ 	n->is_clone = 1;
  	atomic_set(&n->users, 1);
- 	n->inclone = inbuff;
  	n->destructor = NULL;
 +#ifdef CONFIG_ATM_NICSTAR
 +	n->atm.recycle_buffer = NULL;
@@ -13812,7 +13731,7 @@
  	return n;
  }
  
-@@ -308,6 +317,9 @@
+@@ -291,6 +301,9 @@
  	n->stamp=skb->stamp;
  	n->destructor = NULL;
  	n->security=skb->security;
diff -ur --new-file old/atm/doc/usage.tex new/atm/doc/usage.tex
--- old/atm/doc/usage.tex	Thu Apr 23 20:55:55 1998
+++ new/atm/doc/usage.tex	Sat Jun  6 01:30:03 1998
@@ -1,7 +1,7 @@
 %%def%:=
 
 %:\begin{verbatim}
-%:Usage instructions  -  ATM on Linux, release 0.36
+%:Usage instructions  -  ATM on Linux, release 0.37
 %:-------------------------------------------------
 %:
 %:\end{verbatim}
@@ -38,7 +38,7 @@
 
 \title{ATM on Linux \\
   User's guide \\
-  Release 0.36 (alpha)}
+  Release 0.37 (alpha)}
 \author{Werner Almesberger \\
   {\tt Werner.Almesberger@epfl.ch} \\
   \\
@@ -81,9 +81,9 @@
 In order to install this package, you need
 \begin{itemize}
   \item the package itself
-    \url{ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.36.tar.gz}
-  \item the Linux kernel, version 2.1.90, e.g. from
-    \url{ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.1.90.tar.gz}
+    \url{ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.37.tar.gz}
+  \item the Linux kernel, version 2.1.104, e.g. from
+    \url{ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.1.104.tar.gz}
   \item Perl, version 4 or 5
   \item if you want memory debugging: MPR version 1.6, e.g. from
     \url{ftp://sunsite.unc.edu/pub/Linux/devel/lang/c/mpr-1.6.tar.gz}
@@ -98,13 +98,13 @@
 distribution:
 
 \begin{verbatim}
-tar xfz atm-0.36.tar.gz
+tar xfz atm-0.37.tar.gz
 \end{verbatim}
 
 and the kernel source:
 
 \begin{verbatim}
-tar xfz linux-2.1.90.tar.gz
+tar xfz linux-2.1.104.tar.gz
 \end{verbatim}
 
 Finally, you can extract the ATM-related patches:
diff -ur --new-file old/atm/doc/usage.txt new/atm/doc/usage.txt
--- old/atm/doc/usage.txt	Thu Apr 23 20:57:29 1998
+++ new/atm/doc/usage.txt	Sat Jun  6 04:17:28 1998
@@ -1,4 +1,4 @@
-Usage instructions  -  ATM on Linux, release 0.36
+Usage instructions  -  ATM on Linux, release 0.37
 -------------------------------------------------
 
 For updates of ATM on Linux, please check the Web page at  
@@ -17,9 +17,9 @@
 In order to install this package, you need 
 
   - the package itself  
-    ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.36.tar.gz  
-  - the Linux kernel, version 2.1.90, e.g. from  
-    ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.1.90.tar.gz  
+    ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.37.tar.gz  
+  - the Linux kernel, version 2.1.104, e.g. from  
+    ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.1.104.tar.gz  
   - Perl, version 4 or 5 
   - if you want memory debugging: MPR version 1.6, e.g. from  
     ftp://sunsite.unc.edu/pub/Linux/devel/lang/c/mpr-1.6.tar.gz  
@@ -33,11 +33,11 @@
 all the files listed above there. Then extract the ATM on Linux 
 distribution:
 
-tar xfz atm-0.36.tar.gz
+tar xfz atm-0.37.tar.gz
 
 and the kernel source:
 
-tar xfz linux-2.1.90.tar.gz
+tar xfz linux-2.1.104.tar.gz
 
 Finally, you can extract the ATM-related patches:
 
diff -ur --new-file old/atm/ilmid/asn1/asn_len.c new/atm/ilmid/asn1/asn_len.c
--- old/atm/ilmid/asn1/asn_len.c	Tue Apr 22 04:10:19 1997
+++ new/atm/ilmid/asn1/asn_len.c	Wed Jun  3 16:45:34 1998
@@ -49,7 +49,7 @@
         BufPutByteRvs( b, 0x82);
         return (3);
     }
-    else if (len < 16777126)
+    else if (len < 16777216)
     {
         BufPutByteRvs( b, len);
         BufPutByteRvs( b, len >> 8);
diff -ur --new-file old/atm/ilmid/io.c new/atm/ilmid/io.c
--- old/atm/ilmid/io.c	Thu Apr  9 14:49:32 1998
+++ new/atm/ilmid/io.c	Sat Jun  6 02:21:38 1998
@@ -26,10 +26,7 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <net/if.h>
-#include <linux/atm.h>
 #include <linux/atmdev.h>
-#include <linux/atmarp.h>
-#include <linux/atmclip.h>
 #include "io.h"
 #include "atmd.h"
 #include "atm.h"
diff -ur --new-file old/atm/lane/atm.c new/atm/lane/atm.c
--- old/atm/lane/atm.c	Wed Nov 19 13:45:11 1997
+++ new/atm/lane/atm.c	Sat Jun  6 02:28:09 1998
@@ -10,7 +10,6 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <stdio.h>
-#include <linux/atm.h>
 #include <assert.h>
 
 /* Local includes */
diff -ur --new-file old/atm/lane/atm_lecs.c new/atm/lane/atm_lecs.c
--- old/atm/lane/atm_lecs.c	Wed Nov 19 13:45:12 1997
+++ new/atm/lane/atm_lecs.c	Sat Jun  6 02:29:56 1998
@@ -10,8 +10,8 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <stdio.h>
-#include <linux/atm.h>
 #include <assert.h>
+#include <atm.h>
 
 /* Local includes */
 #include "atmsap.h"
diff -ur --new-file old/atm/lane/connect.c new/atm/lane/connect.c
--- old/atm/lane/connect.c	Wed Mar 18 22:11:50 1998
+++ new/atm/lane/connect.c	Sat Jun  6 02:28:22 1998
@@ -16,7 +16,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
-#include <linux/atm.h>
 #include <errno.h>
 
 /* Local includes */
diff -ur --new-file old/atm/lane/dump.c new/atm/lane/dump.c
--- old/atm/lane/dump.c	Wed Nov 19 13:45:12 1997
+++ new/atm/lane/dump.c	Sat Jun  6 02:27:54 1998
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <netinet/in.h>
 
-#include <linux/atm.h>
+#include <atm.h>
 
 /* Local includes */
 #include "atmsap.h"
diff -ur --new-file old/atm/lane/dump.h new/atm/lane/dump.h
--- old/atm/lane/dump.h	Wed Nov 19 13:45:13 1997
+++ new/atm/lane/dump.h	Sat Jun  6 02:27:37 1998
@@ -8,7 +8,7 @@
 #define LANE_DUMP_H
 
 /* System includes needed for types */
-#include <linux/atm.h>
+#include <atm.h>
 
 /* Local includes needed for types */
 #include "atmsap.h"
diff -ur --new-file old/atm/led/address.c new/atm/led/address.c
--- old/atm/led/address.c	Wed Mar 18 22:08:52 1998
+++ new/atm/led/address.c	Sat Jun  6 02:26:24 1998
@@ -41,7 +41,6 @@
 #include <unistd.h>
 
 /* Atm includes */
-#include <linux/atm.h>
 #include <linux/atmdev.h>
 #include <sys/ioctl.h>
 #include <atm.h>
diff -ur --new-file old/atm/led/conn.c new/atm/led/conn.c
--- old/atm/led/conn.c	Wed Mar 18 22:10:44 1998
+++ new/atm/led/conn.c	Sat Jun  6 02:26:41 1998
@@ -45,7 +45,6 @@
 
 /* Atm includes */
 
-#include <linux/atm.h>
 #include <linux/atmdev.h>
 #include <atm.h>
 
diff -ur --new-file old/atm/led/kernel_itf.c new/atm/led/kernel_itf.c
--- old/atm/led/kernel_itf.c	Wed Mar 18 22:16:25 1998
+++ new/atm/led/kernel_itf.c	Sat Jun  6 02:47:54 1998
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <stdlib.h>  /* for malloc() and free() */
 /* Atm includes */
-#include <linux/atm.h>
+#include <atm.h>
 #include <linux/atmlec.h>
 
 /* Local includes */
diff -ur --new-file old/atm/led/le_disp.h new/atm/led/le_disp.h
--- old/atm/led/le_disp.h	Wed Nov 19 12:59:15 1997
+++ new/atm/led/le_disp.h	Sat Jun  6 02:47:10 1998
@@ -36,7 +36,7 @@
  * LE Frame Parser and Displayer
  *
  */
-#include <linux/atm.h>
+#include <atm.h>
 #include "svc_info.h"
 
 const char *disp_status_text (UINT16 status);
diff -ur --new-file old/atm/led/lec_arp.c new/atm/led/lec_arp.c
--- old/atm/led/lec_arp.c	Sun Feb  1 13:23:04 1998
+++ new/atm/led/lec_arp.c	Sat Jun  6 02:46:27 1998
@@ -31,6 +31,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h> /* includes linux/atm.h */
 #include <linux/atmlec.h>
 
 /* Include General Headers. */
diff -ur --new-file old/atm/lib/ans.c new/atm/lib/ans.c
--- old/atm/lib/ans.c	Sat Nov  8 00:10:25 1997
+++ new/atm/lib/ans.c	Sat Jun  6 01:52:45 1998
@@ -1,6 +1,6 @@
 /* ans.c - Interface for text2atm and atm2text to ANS */
 
-/* Written 1996 by Werner Almesberger, EPFL-LRC */
+/* Written 1996,1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 
 /*
@@ -20,7 +20,6 @@
 #include <arpa/nameser.h>
 #include <netdb.h>
 #include <resolv.h>
-#include <linux/atm.h>
 
 #include "atm.h"
 #include "atmres.h"
diff -ur --new-file old/atm/lib/arequipa.c new/atm/lib/arequipa.c
--- old/atm/lib/arequipa.c	Wed Mar 18 21:38:37 1998
+++ new/atm/lib/arequipa.c	Sat Jun  6 01:51:36 1998
@@ -7,6 +7,8 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+
+#include <stdint.h> /* linux/arequipa.h uses linux/atm.h */
 #include <linux/arequipa.h>
 #include <linux/atmclip.h>
 
diff -ur --new-file old/atm/lib/atm.h new/atm/lib/atm.h
--- old/atm/lib/atm.h	Tue Apr 14 13:39:15 1998
+++ new/atm/lib/atm.h	Sat Jun  6 01:01:26 1998
@@ -6,6 +6,7 @@
 #ifndef _ATM_H
 #define _ATM_H
 
+#include <stdint.h>
 #include <sys/socket.h>
 #include <linux/atm.h>
 
@@ -15,8 +16,8 @@
  * is in sys/socket.h
  */
 
-#define AF_ATMPVC	20
-#define AF_ATMSVC	21
+#define AF_ATMPVC	8
+#define AF_ATMSVC	20
 #define PF_ATMPVC	AF_ATMPVC
 #define PF_ATMSVC	AF_ATMSVC
 #define SOL_ATM		264
diff -ur --new-file old/atm/lib/stdint.h new/atm/lib/stdint.h
--- old/atm/lib/stdint.h	Fri Feb 27 19:59:03 1998
+++ new/atm/lib/stdint.h	Sat Jun  6 02:52:31 1998
@@ -1,7 +1,10 @@
 /* stdint.h - provides uintXX_t until glibc does */
 
 #ifndef _STDINT_H
-#define _STDINT_H
+
+#include <features.h>
+
+#if __GLIBC__ >= 2
 
 /* Works for i386 and Alpha */
 
@@ -9,4 +12,13 @@
 typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
 
+#else
+
+#ifndef _LINUX_TYPES_H
+#include <linux/types.h>
+#endif
+
+#endif
+
+#define _STDINT_H
 #endif
diff -ur --new-file old/atm/maint/atmaddr.c new/atm/maint/atmaddr.c
--- old/atm/maint/atmaddr.c	Tue Nov 18 20:28:03 1997
+++ new/atm/maint/atmaddr.c	Sat Jun  6 02:11:51 1998
@@ -1,6 +1,6 @@
 /* atmaddr.c - Get/set local ATM adresses */
 
-/* Written 1995,1996 by Werner Almesberger, EPFL-LRC */
+/* Written 1995,1996,1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 
 #include <stdlib.h>
@@ -8,7 +8,6 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <linux/atm.h>
 #include <linux/atmdev.h>
 
 #include "atm.h"
diff -ur --new-file old/atm/maint/atmdiag.c new/atm/maint/atmdiag.c
--- old/atm/maint/atmdiag.c	Wed Oct 22 23:07:51 1997
+++ new/atm/maint/atmdiag.c	Sat Jun  6 02:12:07 1998
@@ -1,6 +1,6 @@
 /* atmdiag.c - ATM diagnostics */
 
-/* Written 1995,1996 by Werner Almesberger, EPFL-LRC */
+/* Written 1995,1996,1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 
 #include <stdlib.h>
@@ -10,8 +10,9 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <linux/atm.h>
 #include <linux/atmdev.h>
+
+#include <atm.h>
 
 
 #define BUF_LEN 1024 /* ugly */
diff -ur --new-file old/atm/maint/atmdump.c new/atm/maint/atmdump.c
--- old/atm/maint/atmdump.c	Tue Sep 23 10:01:45 1997
+++ new/atm/maint/atmdump.c	Sat Jun  6 02:12:49 1998
@@ -1,6 +1,6 @@
 /* atmdump.c - ATM raw cell dumper */
 
-/* Written 1995-1997 by Werner Almesberger, EPFL-LRC */
+/* Written 1995-1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 
 #include <stdlib.h>
@@ -12,7 +12,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h> /* for htonl and ntohl */
-#include <linux/atm.h>
 #include <atm.h>
 
 
diff -ur --new-file old/atm/maint/atmtcp.c new/atm/maint/atmtcp.c
--- old/atm/maint/atmtcp.c	Thu Apr 16 11:26:48 1998
+++ new/atm/maint/atmtcp.c	Sat Jun  6 02:42:32 1998
@@ -15,19 +15,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <linux/atm.h>
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= 0x20100
+#include <atm.h>
 #include <linux/atm_tcp.h>
-#else
-
-struct atmtcp_hdr {
-    unsigned short vpi;
-    unsigned short vci;
-    unsigned short length; /* ... of data part */
-};
-
-#endif
 
 
 #define PORT 8402	/* old ATMTCP used 8401, but now the header is in
diff -ur --new-file old/atm/maint/saaldump.c new/atm/maint/saaldump.c
--- old/atm/maint/saaldump.c	Mon Oct  6 21:51:21 1997
+++ new/atm/maint/saaldump.c	Sat Jun  6 02:16:02 1998
@@ -1,6 +1,6 @@
 /* saaldump.c - ATM signaling message dumper */
 
-/* Written 1997 by Werner Almesberger, EPFL-LRC */
+/* Written 1997,1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 
 #include <stdlib.h>
@@ -12,16 +12,11 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <linux/atm.h>
 #include <atm.h>
 
 #include "pdu.h"
 #define DUMP_MODE
 #include "qlib.h"
-
-#if 0
-#include <netinet/in.h> /* for htonl and ntohl */
-#endif
 
 
 static int interval = 0; /* display absolute time by default */
diff -ur --new-file old/atm/maint/sonetdiag.c new/atm/maint/sonetdiag.c
--- old/atm/maint/sonetdiag.c	Mon Oct  6 22:12:36 1997
+++ new/atm/maint/sonetdiag.c	Sat Jun  6 02:14:18 1998
@@ -1,6 +1,6 @@
 /* sonetdiag.c - SONET diagnostics */
 
-/* Written 1995-1997 by Werner Almesberger, EPFL-LRC */
+/* Written 1995-1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 
 #include <stdlib.h>
@@ -10,7 +10,7 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <linux/atm.h>
+#include <atm.h>
 #include <linux/atmdev.h>
 #include <linux/sonet.h>
 
diff -ur --new-file old/atm/maint/zntune.c new/atm/maint/zntune.c
--- old/atm/maint/zntune.c	Fri Apr  4 20:04:47 1997
+++ new/atm/maint/zntune.c	Sat Jun  6 02:43:40 1998
@@ -1,6 +1,6 @@
 /* zntune.c - ZN122x free buffer pool tuning */
  
-/* Written 1995-1997 by Werner Almesberger, EPFL-LRC */
+/* Written 1995-1998 by Werner Almesberger, EPFL-LRC/ICA */
  
 
 #include <stdlib.h>
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <linux/atm.h>
+#include <atm.h>
 #include <sys/time.h> /* for struct timeval, although it's not used */
 #include <linux/atm_zatm.h>
 
diff -ur --new-file old/atm/mkdist new/atm/mkdist
--- old/atm/mkdist	Thu Apr 16 12:31:43 1998
+++ new/atm/mkdist	Sat Jun  6 04:15:43 1998
@@ -1,7 +1,7 @@
 #!/bin/sh
 [ -r ./VERSION ] || exit 1
 VERSION=`cat ./VERSION`
-SRCDIR=$HOME/k/2190
+SRCDIR=$HOME/k/2104
 ARCHDIR=$HOME/l/arch
 (
     cd $SRCDIR
@@ -38,7 +38,7 @@
   atm/arpd/Makefile atm/arpd/arp.c atm/arpd/arp.h atm/arpd/atmarpd.c \
     atm/arpd/atmarpd.h atm/arpd/io.c atm/arpd/io.h atm/arpd/itf.c \
     atm/arpd/itf.h atm/arpd/table.c atm/arpd/table.h atm/arpd/atmarpd.8 \
-    atm/arpd/atmarp.c atm/arpd/atmarp.8 \
+    atm/arpd/atmarp.c atm/arpd/atmarp.8 atm/arpd/atmarp.h \
   atm/ilmid/COPYRIGHT atm/ilmid/Makefile \
     atm/ilmid/rfc1155_smi.c atm/ilmid/rfc1155_smi.h \
     atm/ilmid/rfc1157_snmp.c atm/ilmid/rfc1157_snmp.h \
@@ -113,6 +113,7 @@
     atm/switch/route.h atm/switch/route.c atm/switch/sig.h atm/switch/sig.c \
     atm/switch/dispatch.h atm/switch/dispatch.c \
     atm/switch/debug/README atm/switch/debug/Makefile atm/switch/debug/debug.c \
+    atm/switch/debug/demo \
   atm/extra/extra.html atm/extra/Makefile atm/extra/tcpdump-3.0.4-1.patch \
     atm/extra/bind-4.9.5-REL.patch atm/extra/hosts2ans.pl \
   atm/config/README atm/config/Makefile atm/config\
diff -ur --new-file old/atm/sigd/atmsigd.c new/atm/sigd/atmsigd.c
--- old/atm/sigd/atmsigd.c	Thu Apr 16 09:13:45 1998
+++ new/atm/sigd/atmsigd.c	Sat Jun  6 02:03:26 1998
@@ -11,7 +11,6 @@
 #include <signal.h>
 #include <limits.h>
 #include <sys/types.h>
-#include <linux/atm.h>
 
 #include "atm.h"
 #include "atmd.h"
diff -ur --new-file old/atm/sigd/cfg.l new/atm/sigd/cfg.l
--- old/atm/sigd/cfg.l	Wed Nov  5 17:32:36 1997
+++ new/atm/sigd/cfg.l	Sat Jun  6 02:10:04 1998
@@ -1,14 +1,13 @@
 %{
 /* cfg.l - configuration language */
  
-/* Written 1995-1997 by Werner Almesberger, EPFL-LRC */
+/* Written 1995-1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <linux/atm.h>
 
 #include "atm.h"
 
diff -ur --new-file old/atm/sigd/cfg.y new/atm/sigd/cfg.y
--- old/atm/sigd/cfg.y	Wed Nov  5 18:34:43 1997
+++ new/atm/sigd/cfg.y	Sat Jun  6 02:10:34 1998
@@ -1,12 +1,11 @@
 %{
 /* cfg.y - configuration language */
 
-/* Written 1995-1997 by Werner Almesberger, EPFL-LRC */
+/* Written 1995-1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 
 #include <string.h>
 #include <ctype.h>
-#include <linux/atm.h>
 
 #include "atm.h"
 #include "atmd.h"
diff -ur --new-file old/atm/sigd/io.c new/atm/sigd/io.c
--- old/atm/sigd/io.c	Thu Apr 16 10:27:29 1998
+++ new/atm/sigd/io.c	Sat Jun  6 02:04:50 1998
@@ -13,8 +13,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <linux/atm.h>
 #include <linux/atmdev.h>
+#include <stdint.h> /* linux/atmsvc.h includes linux/atm.h */
 #include <linux/atmsvc.h>
 
 #include "atm.h"
diff -ur --new-file old/atm/sigd/io.h new/atm/sigd/io.h
--- old/atm/sigd/io.h	Wed Apr 15 19:57:26 1998
+++ new/atm/sigd/io.h	Sat Jun  6 02:07:21 1998
@@ -6,6 +6,7 @@
 #ifndef IO_H
 #define IO_H
 
+#include <stdint.h>
 #include <linux/atm.h>
 #include <linux/atmsvc.h>
 
diff -ur --new-file old/atm/sigd/kernel.c new/atm/sigd/kernel.c
--- old/atm/sigd/kernel.c	Thu Apr 16 09:14:48 1998
+++ new/atm/sigd/kernel.c	Sat Jun  6 02:05:28 1998
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <assert.h>
-#include <linux/atm.h>
+#include <stdint.h> /* linux/atmsvc.h includes linux/atm.h */
 #include <linux/atmsvc.h>
 #include <linux/atmdev.h>
 
diff -ur --new-file old/atm/sigd/proto.h new/atm/sigd/proto.h
--- old/atm/sigd/proto.h	Fri Mar 13 20:23:37 1998
+++ new/atm/sigd/proto.h	Sat Jun  6 02:09:22 1998
@@ -6,6 +6,7 @@
 #ifndef PROTO_H
 #define PROTO_H
 
+#include <stdint.h>
 #include <linux/atmsvc.h>
 
 #include "atmsap.h"
diff -ur --new-file old/atm/sigd/sap.c new/atm/sigd/sap.c
--- old/atm/sigd/sap.c	Thu Apr  9 14:51:56 1998
+++ new/atm/sigd/sap.c	Sat Jun  6 02:08:06 1998
@@ -6,8 +6,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <linux/atm.h>
 #include <linux/atmdev.h>
+#include <stdint.h> /* sigh, again */
 #include <linux/atmsvc.h>
 
 #include "atm.h"
diff -ur --new-file old/atm/sigd/trace.c new/atm/sigd/trace.c
--- old/atm/sigd/trace.c	Wed Mar  4 11:02:15 1998
+++ new/atm/sigd/trace.c	Sat Jun  6 02:06:24 1998
@@ -9,8 +9,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <sys/time.h>
-
-#include <linux/atm.h>
+#include <stdint.h> /* linux/atmsvc.h includes linux/atm.h */
 #include <linux/atmsvc.h>
 
 #include "atm.h"
diff -ur --new-file old/atm/switch/debug/README new/atm/switch/debug/README
--- old/atm/switch/debug/README	Thu Apr 16 18:12:01 1998
+++ new/atm/switch/debug/README	Sat Jun  6 04:13:40 1998
@@ -1,8 +1,7 @@
 This is a little sample configuration with two terminals connected to a
-switch. All of the are on the same host and atmtcp takes care of the
-"wiring". The terminals are controlled by the isp program. (We can't use
-the real kernel with multiple terminals on the same machine. At least
-not yet.)
+switch. All of the network elements are on the same host and atmtcp takes
+care of the the real kernel with multiple terminals on the same machine.
+At least not yet.)
 
 Note that no data transfer or such is possible yet. This is only
 signaling.
@@ -66,6 +65,12 @@
 +-------------------+					 +-------------------+
 | isp /tmp/1 <1.isp |					 | isp /tmp/4 <4.isp |
 +-------------------+					 +-------------------+
+
+
+You can use the script "demo" to run this setup. You need to build the switch
+library and the debug switch first:
+  cd ..; make
+  cd debug; make
 
 
 --- switch.conf --------------------------------------------------------------
diff -ur --new-file old/atm/switch/debug/debug.c new/atm/switch/debug/debug.c
--- old/atm/switch/debug/debug.c	Thu Apr 16 15:29:35 1998
+++ new/atm/switch/debug/debug.c	Sat Jun  6 03:51:50 1998
@@ -5,6 +5,7 @@
 
 #include <stdlib.h>
 
+#include <atm.h>
 #include <atmd.h>
 
 #include "../fab.h"
@@ -66,7 +67,7 @@
 
     if (pvc->sap_addr.vpi == ATM_VPI_ANY) pvc->sap_addr.vpi = 0;
 	/* that was easy :-) */
-    for (vci = 32; pvc->sap_addr.vci == ATM_VCI_ANY; vci++)
+    for (vci = ATM_NOT_RSV_VCI; pvc->sap_addr.vci == ATM_VCI_ANY; vci++)
 	if (!vci_exists(vci,0)) pvc->sap_addr.vci = vci;
     return !vci_exists(vci,1);
 }
diff -ur --new-file old/atm/switch/debug/demo new/atm/switch/debug/demo
--- old/atm/switch/debug/demo	Thu Jan  1 01:00:00 1970
+++ new/atm/switch/debug/demo	Sat Jun  6 04:14:05 1998
@@ -0,0 +1,57 @@
+#!/usr/bin/perl
+
+@cmd = ("xterm -fn 5x7 -geometry +25+400",
+	"xterm -fn 5x7 -geometry +25+200",
+	"xterm -fn 5x7 -geometry +450+200",
+	"xterm -fn 5x7 -geometry +450+400",
+	"xterm -fn 5x7 -geometry 132x24+110+0",
+	"xterm -fn 5x7 -geometry +475+600",
+	"xterm -fn 5x7 -geometry +0+600");
+
+open(IN,"README") || die "open README: $!";
+while (<IN>) {
+    if (/^---\s*(\S+)\s*/) {
+	if ($mode eq "F") {
+	    close OUT || die "close: $!";
+	}
+	open(OUT,">$1") || die "create $1: $!";
+	$mode = "F";
+	next;
+    }
+    if (/^Preparation/) {
+	$mode = "P";
+	next;
+    }
+    if (/^Start/) {
+	$mode = "S";
+	next;
+    }
+    if ($mode eq "P") {
+	chop;
+	$_ .= " &" if /-l/;
+	push(@do,$') if /^\s*#\s*/;
+	next;
+    }
+    if ($mode eq "S") {
+	chop;
+	next unless /^\s*%\s*/;
+	$c = $';
+	$c =~ s/-b/-d -l stderr/;
+	$c =~ s/isp/isp -v/;
+	$o = $c;
+	$c = "sh -c \"$c; sleep 300\"" if $c =~ /isp/;
+	push(@do,shift(@cmd)." -T '$o' -e $c &");
+	next;
+    }
+    if ($mode eq "F") {
+	print OUT $_ || die "write: $!";
+    }
+}
+if ($mode eq "F") {
+    close OUT || die "close: $!";
+}
+for (@do) {
+    print "$_\n";
+    system($_);
+    sleep(1);
+}
diff -ur --new-file old/atm/switch/proto.c new/atm/switch/proto.c
--- old/atm/switch/proto.c	Thu Apr 16 08:22:34 1998
+++ new/atm/switch/proto.c	Sat Jun  6 04:05:38 1998
@@ -10,6 +10,8 @@
 #include <unistd.h>
 #include <string.h>
 
+#include <atm.h>
+
 #include "atmd.h"
 #include "sig.h"
 #include "fab.h"
diff -ur --new-file old/atm/switch/relay.c new/atm/switch/relay.c
--- old/atm/switch/relay.c	Thu Apr 16 15:50:54 1998
+++ new/atm/switch/relay.c	Sat Jun  6 04:06:08 1998
@@ -7,7 +7,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 #include <errno.h>
+
+#include <atm.h>
 
 #include "atmd.h"
 #include "fab.h"
diff -ur --new-file old/atm/switch/sig.c new/atm/switch/sig.c
--- old/atm/switch/sig.c	Thu Apr 16 10:22:10 1998
+++ new/atm/switch/sig.c	Sat Jun  6 04:06:47 1998
@@ -4,7 +4,9 @@
 
 
 #include <unistd.h>
+#include <string.h>
 #include <errno.h>
+#include <stdint.h>
 #include <linux/atmsvc.h>
 
 #include "atmd.h"
diff -ur --new-file old/atm/test/align.c new/atm/test/align.c
--- old/atm/test/align.c	Fri Oct 10 12:26:17 1997
+++ new/atm/test/align.c	Sat Jun  6 01:52:39 1998
@@ -1,6 +1,6 @@
 /* align.c - Exercise PDU mis-alignment handling by the NIC */
 
-/* Written 1997 by Werner Almesberger, EPFL-LRC */
+/* Written 1997,1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 /*
  * This program requires a kernel modification: if the first byte of the PDU
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
-#include <linux/atm.h>
 #include <atm.h>
 
 
diff -ur --new-file old/atm/test/aping.c new/atm/test/aping.c
--- old/atm/test/aping.c	Tue Mar 11 12:01:59 1997
+++ new/atm/test/aping.c	Sat Jun  6 01:52:51 1998
@@ -11,7 +11,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <linux/atm.h>
 #include <atm.h>
 
 
diff -ur --new-file old/atm/test/aread.c new/atm/test/aread.c
--- old/atm/test/aread.c	Fri Feb 20 11:18:24 1998
+++ new/atm/test/aread.c	Sat Jun  6 01:53:08 1998
@@ -10,7 +10,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <linux/atm.h>
 #include <atm.h>
 
 
diff -ur --new-file old/atm/test/awrite.c new/atm/test/awrite.c
--- old/atm/test/awrite.c	Thu Mar  5 20:00:09 1998
+++ new/atm/test/awrite.c	Sat Jun  6 01:53:20 1998
@@ -1,6 +1,6 @@
 /* awrite.c - send AAL5 PDU */
 
-/* Written 1995-1997 by Werner Almesberger, EPFL-LRC */
+/* Written 1995-1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 
 #include <stdlib.h>
@@ -10,7 +10,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <linux/atm.h>
 #include <atm.h>
 
 
diff -ur --new-file old/atm/test/br.c new/atm/test/br.c
--- old/atm/test/br.c	Tue Mar 11 12:02:47 1997
+++ new/atm/test/br.c	Sat Jun  6 01:53:41 1998
@@ -1,6 +1,6 @@
 /* br.c - block read */
 
-/* Written 1995-1997 by Werner Almesberger, EPFL-LRC */
+/* Written 1995-1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 
 #include <stdlib.h>
@@ -10,7 +10,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <linux/atm.h>
 #include <atm.h>
 
 
diff -ur --new-file old/atm/test/bw.c new/atm/test/bw.c
--- old/atm/test/bw.c	Tue Mar 11 12:03:02 1997
+++ new/atm/test/bw.c	Sat Jun  6 01:53:50 1998
@@ -1,6 +1,6 @@
 /* bw.c - block write */
 
-/* Written 1995-1997 by Werner Almesberger, EPFL-LRC */
+/* Written 1995-1998 by Werner Almesberger, EPFL-LRC/ICA */
 
 
 #include <stdlib.h>
@@ -10,7 +10,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <linux/atm.h>
 #include <atm.h>
 
 
diff -ur --new-file old/atm/test/ispl.l new/atm/test/ispl.l
--- old/atm/test/ispl.l	Thu Mar  5 22:26:17 1998
+++ new/atm/test/ispl.l	Sat Jun  6 01:57:42 1998
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <stdint.h>
 #include <linux/atmsvc.h>
 
 #include "isp.h"
diff -ur --new-file old/atm/test/ttcp.c new/atm/test/ttcp.c
--- old/atm/test/ttcp.c	Thu Oct  9 16:27:39 1997
+++ new/atm/test/ttcp.c	Sat Jun  6 01:59:20 1998
@@ -33,6 +33,8 @@
  *	SGI IRIX 3.3 and 4.0 releases don't need #define SYSV.
  * Modified April 1994 by John Lin (lin@cs.purdue.edu)
  *      Add CPU_USAGE complier option and move the "gettimeofday" calls.
+ * Heavily modified since 1995 by Werner Almesberger, EPFL ICA
+ *      Various ATM-related changes
  *
  * Distribution Status -
  *      Public Domain.  Distribution Unlimited.
@@ -58,7 +60,6 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/time.h>		/* struct timeval */
-#include <linux/atm.h>
 #include <atm.h>
 #include <atmsap.h>
 #include <arequipa.h>
diff -ur --new-file old/atm/test/window.c new/atm/test/window.c
--- old/atm/test/window.c	Sat Nov  8 00:12:02 1997
+++ new/atm/test/window.c	Sat Jun  6 01:59:32 1998
@@ -46,7 +46,6 @@
 #include <assert.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <linux/atm.h>
 #include <atm.h>
 
 #undef MDW_DEBUG

.