diff -ur --new-file old/atm/.kernel new/atm/.kernel
--- old/atm/.kernel Tue Feb 9 16:36:57 1999
+++ new/atm/.kernel Thu Jun 3 01:03:59 1999
@@ -1,2 +1,2 @@
# this file is used to control automated generation of differences
-2.2.1
+2.2.9
diff -ur --new-file old/atm/CHANGES new/atm/CHANGES
--- old/atm/CHANGES Thu Jun 3 00:22:06 1999
+++ new/atm/CHANGES Thu Jun 3 02:06:18 1999
@@ -1,3 +1,18 @@
+Version 0.58 to 0.59 (3-JUN-1999)
+====================
+
+New features
+------------
+
+ - upgrade to kernel version 2.2.9
+ - zeppelin now adjusts MTU when joining ELAN (Heikki Vatiainen)
+
+Other changes
+-------------
+
+ - adjusted tr interface name limit to 8 characters (down from a wasteful 9)
+
+
Version 0.57 to 0.58 (3-JUN-1999)
====================
diff -ur --new-file old/atm/README new/atm/README
--- old/atm/README Mon May 31 22:55:35 1999
+++ new/atm/README Thu Jun 3 01:04:08 1999
@@ -1,4 +1,4 @@
-ATM on Linux, release 0.58 (alpha) by Werner Almesberger, EPFL ICA
+ATM on Linux, release 0.59 (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.2.1 kernel.
+The kernel patch is relative to the "standard" 2.2.9 kernel.
Please see http://icawww1.epfl.ch/linux-atm/info.html for a list of
features supported by ATM on Linux.
diff -ur --new-file old/atm/USAGE new/atm/USAGE
--- old/atm/USAGE Thu Jun 3 00:23:59 1999
+++ new/atm/USAGE Thu Jun 3 02:07:20 1999
@@ -1,4 +1,4 @@
-%:Usage instructions - ATM on Linux, release 0.58
+%:Usage instructions - ATM on Linux, release 0.59
%:-------------------------------------------------
%:
%:
@@ -20,9 +20,9 @@
In order to install this package, you need
- the package itself
- ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.58.tar.gz
- - the Linux kernel, version 2.2.1, e.g. from
- ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.2.1.tar.gz
+ ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.59.tar.gz
+ - the Linux kernel, version 2.2.9, e.g. from
+ ftp://ftp.kernel.org/pub/linux/kernel/v2.2/linux-2.2.9.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
@@ -36,11 +36,11 @@
all the files listed above there. Then extract the ATM on Linux
distribution:
-tar xfz atm-0.58.tar.gz
+tar xfz atm-0.59.tar.gz
and the kernel source:
-tar xfz linux-2.2.1.tar.gz
+tar xfz linux-2.2.9.tar.gz
Finally, you can extract the ATM-related patches:
@@ -825,11 +825,9 @@
parameters can be tailored with command line options which are defined in
zeppelin.8.
-zeppelin, will automatically join any ELANs which use higher MTU than the
-default MTU of 1516 bytes. However, the MTU of the LANE interface will not
-change before you use ifconfig to adjust it. This will probably change
-later so that the interface MTU will adjust itself according to the MTU of
-the current ELAN.
+zeppelin will automatically join any ELANs which use higher MTU than the
+default MTU of 1516 bytes. The MTU of the LANE interface will adjust itself
+according to the MTU of the current ELAN.
The state of the LANE ARP cache entries can be monitored through
/proc/atm/lec. For each entry the MAC and ATM addresses and status is
diff -ur --new-file old/atm/VERSION new/atm/VERSION
--- old/atm/VERSION Wed Jun 2 23:39:42 1999
+++ new/atm/VERSION Thu Jun 3 01:03:53 1999
@@ -1 +1 @@
-0.58
+0.59
diff -ur --new-file old/atm/atm.patch new/atm/atm.patch
--- old/atm/atm.patch Thu Jun 3 00:31:13 1999
+++ new/atm/atm.patch Thu Jun 3 02:07:01 1999
@@ -1,5 +1,5 @@
---- ref/Makefile Tue Jan 26 02:46:35 1999
-+++ work/Makefile Tue Feb 9 15:49:57 1999
+--- ref/Makefile Wed May 12 17:50:12 1999
++++ work/Makefile Thu Jun 3 01:00:37 1999
@@ -122,6 +122,10 @@
DRIVERS := $(DRIVERS) drivers/net/net.a
@@ -11,7 +11,7 @@
ifeq ($(CONFIG_SCSI),y)
DRIVERS := $(DRIVERS) drivers/scsi/scsi.a
endif
-@@ -321,6 +325,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; \
@@ -19,9 +19,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 Wed Jan 20 20:05:32 1999
-+++ work/Documentation/Configure.help Tue May 18 01:13:20 1999
-@@ -3460,6 +3460,217 @@
+--- ref/Documentation/Configure.help Tue May 11 18:57:14 1999
++++ work/Documentation/Configure.help Thu Jun 3 01:00:38 1999
+@@ -3525,6 +3525,217 @@
This is a backward compatibility option, choose Y for now.
This option will be removed soon.
@@ -240,14 +240,14 @@
CONFIG_SCSI
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 Mon May 3 02:18:18 1999
++++ work/Documentation/atm.txt Thu Jun 3 01:00:38 1999
@@ -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://icawww1.epfl.ch/linux-atm/
---- ref/arch/i386/config.in Wed Jan 20 19:18:53 1999
-+++ work/arch/i386/config.in Tue Feb 9 15:49:57 1999
+--- ref/arch/i386/config.in Mon Apr 26 22:49:17 1999
++++ work/arch/i386/config.in Thu Jun 3 01:00:38 1999
@@ -139,6 +139,9 @@
bool 'Network device support' CONFIG_NETDEVICES
if [ "$CONFIG_NETDEVICES" = "y" ]; then
@@ -258,9 +258,9 @@
fi
endmenu
fi
---- ref/arch/alpha/config.in Thu Jan 14 19:29:28 1999
-+++ work/arch/alpha/config.in Tue Feb 9 15:49:57 1999
-@@ -227,6 +227,9 @@
+--- ref/arch/alpha/config.in Mon May 10 18:55:21 1999
++++ work/arch/alpha/config.in Thu Jun 3 01:00:38 1999
+@@ -220,6 +220,9 @@
bool 'Network device support' CONFIG_NETDEVICES
if [ "$CONFIG_NETDEVICES" = "y" ]; then
source drivers/net/Config.in
@@ -270,9 +270,9 @@
fi
endmenu
fi
---- ref/arch/sparc/config.in Thu Jan 14 19:29:28 1999
-+++ work/arch/sparc/config.in Wed Jun 2 23:33:38 1999
-@@ -170,6 +170,9 @@
+--- ref/arch/sparc/config.in Tue Mar 16 01:10:43 1999
++++ work/arch/sparc/config.in Thu Jun 3 01:00:38 1999
+@@ -173,6 +173,9 @@
# bool 'FDDI driver support' CONFIG_FDDI
# if [ "$CONFIG_FDDI" = "y" ]; then
# fi
@@ -282,18 +282,18 @@
fi
endmenu
fi
---- ref/drivers/Makefile Fri Nov 20 17:59:01 1998
-+++ work/drivers/Makefile Tue Feb 9 15:49:57 1999
+--- ref/drivers/Makefile Mon May 10 19:18:34 1999
++++ work/drivers/Makefile Thu Jun 3 01:01:08 1999
@@ -10,7 +10,7 @@
SUB_DIRS := block char net misc sound
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS) pci scsi sbus cdrom isdn pnp \
-- macintosh video dio zorro fc4
-+ macintosh video dio zorro fc4 atm
+- macintosh video dio zorro fc4 usb
++ macintosh video dio zorro fc4 usb atm
ifdef CONFIG_DIO
SUB_DIRS += dio
-@@ -76,6 +76,11 @@
+@@ -85,6 +85,11 @@
ifeq ($(CONFIG_ISDN),m)
MOD_SUB_DIRS += isdn
endif
@@ -306,7 +306,7 @@
ifeq ($(CONFIG_AP1000),y)
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/Config.in Mon May 31 22:39:11 1999
++++ work/drivers/atm/Config.in Thu Jun 3 01:00:38 1999
@@ -0,0 +1,45 @@
+#
+# ATM device configuration
@@ -354,7 +354,7 @@
+ fi
+fi
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/Makefile Mon May 31 22:39:11 1999
++++ work/drivers/atm/Makefile Thu Jun 3 01:00:39 1999
@@ -0,0 +1,79 @@
+# File: drivers/atm/Makefile
+#
@@ -436,7 +436,7 @@
+
+include $(TOPDIR)/Rules.make
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/ambassador.c Fri May 7 15:42:50 1999
++++ work/drivers/atm/ambassador.c Thu Jun 3 01:00:39 1999
@@ -0,0 +1,2650 @@
+/*
+ Madge Ambassador ATM Adapter driver.
@@ -3089,7 +3089,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/ambassador.h Fri May 7 15:42:50 1999
++++ work/drivers/atm/ambassador.h Thu Jun 3 01:20:13 1999
@@ -0,0 +1,687 @@
+/*
+ Madge Ambassador ATM Adapter driver.
@@ -3779,7 +3779,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/atmdev_init.c Tue May 18 01:13:20 1999
++++ work/drivers/atm/atmdev_init.c Thu Jun 3 01:00:39 1999
@@ -0,0 +1,60 @@
+/* drivers/atm/atmdev_init.c - ATM device driver initialization */
+
@@ -3842,7 +3842,7 @@
+ return devs;
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/atmsar11.data Tue Mar 16 19:13:42 1999
++++ work/drivers/atm/atmsar11.data Thu Jun 3 01:00:39 1999
@@ -0,0 +1,2063 @@
+/*
+ Madge Ambassador ATM Adapter microcode.
@@ -5908,17 +5908,17 @@
+ 0x00400008,
+ 0x00000000,
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/atmsar11.regions Thu Mar 11 15:12:37 1999
++++ work/drivers/atm/atmsar11.regions Thu Jun 3 01:00:39 1999
@@ -0,0 +1,3 @@
+ { 0x00000080, 993, },
+ { 0xa0d0d500, 80, },
+ { 0xa0d0f000, 978, },
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/atmsar11.start Thu Mar 11 15:12:38 1999
++++ work/drivers/atm/atmsar11.start Thu Jun 3 01:00:39 1999
@@ -0,0 +1 @@
+ 0xa0d0f000
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/atmtcp.c Tue Feb 9 15:49:57 1999
++++ work/drivers/atm/atmtcp.c Thu Jun 3 01:00:39 1999
@@ -0,0 +1,339 @@
+/* drivers/atm/atmtcp.c - ATM over TCP "device" driver */
+
@@ -6260,7 +6260,7 @@
+#endif
+
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/eni.c Wed Jun 2 23:46:23 1999
++++ work/drivers/atm/eni.c Thu Jun 3 01:00:39 1999
@@ -0,0 +1,2264 @@
+/* drivers/atm/eni.c - Efficient Networks ENI155P device driver */
+
@@ -8527,7 +8527,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/eni.h Thu Jun 3 00:26:42 1999
++++ work/drivers/atm/eni.h Thu Jun 3 01:20:01 1999
@@ -0,0 +1,115 @@
+/* drivers/atm/eni.h - Efficient Networks ENI155P device driver declarations */
+
@@ -8645,7 +8645,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/horizon.c Fri May 7 15:42:50 1999
++++ work/drivers/atm/horizon.c Thu Jun 3 01:00:39 1999
@@ -0,0 +1,3065 @@
+/*
+ Madge Horizon ATM Adapter driver.
@@ -11713,7 +11713,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/horizon.h Fri May 7 15:42:50 1999
++++ work/drivers/atm/horizon.h Thu Jun 3 01:20:10 1999
@@ -0,0 +1,506 @@
+/*
+ Madge Horizon ATM Adapter driver.
@@ -12222,7 +12222,7 @@
+
+#endif /* DRIVER_ATM_HORIZON_H */
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/midway.h Mon May 31 22:30:32 1999
++++ work/drivers/atm/midway.h Thu Jun 3 01:00:39 1999
@@ -0,0 +1,265 @@
+/* drivers/atm/midway.h - Efficient Networks Midway (SAR) description */
+
@@ -12490,7 +12490,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/nicstar.h Mon May 31 22:39:11 1999
++++ work/drivers/atm/nicstar.h Thu Jun 3 01:00:39 1999
@@ -0,0 +1,774 @@
+/******************************************************************************
+ *
@@ -13267,7 +13267,7 @@
+
+#endif /* _LINUX_NICSTAR_H_ */
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/nicstar.c Mon May 31 22:39:11 1999
++++ work/drivers/atm/nicstar.c Thu Jun 3 01:00:39 1999
@@ -0,0 +1,3054 @@
+/******************************************************************************
+ *
@@ -16324,7 +16324,7 @@
+ return (unsigned char) data;
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/nicstar.c.old_skb Tue Feb 9 15:49:57 1999
++++ work/drivers/atm/nicstar.c.old_skb Thu Jun 3 01:00:39 1999
@@ -0,0 +1,2883 @@
+/******************************************************************************
+ *
@@ -19210,7 +19210,7 @@
+ PRINTK("nicstar: Leaving ns_poll().\n");
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/nicstarmac.h Tue Feb 9 15:49:57 1999
++++ work/drivers/atm/nicstarmac.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,14 @@
+/******************************************************************************
+ *
@@ -19227,7 +19227,7 @@
+void nicstar_init_eprom( virt_addr_t base );
+void nicstar_read_eprom( virt_addr_t, u_int8_t, u_int8_t *, u_int32_t);
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/nicstarmac.c Tue Feb 9 15:49:57 1999
++++ work/drivers/atm/nicstarmac.c Thu Jun 3 01:00:40 1999
@@ -0,0 +1,269 @@
+/*
+ * this file included by nicstar.c
@@ -19499,7 +19499,7 @@
+*/
+
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/nicstarmac.copyright Tue Feb 9 15:49:57 1999
++++ work/drivers/atm/nicstarmac.copyright Thu Jun 3 01:00:40 1999
@@ -0,0 +1,61 @@
+/* nicstar.c v0.22 Jawaid Bazyar (bazyar@hypermall.com)
+ * nicstar.c, M. Welsh (matt.welsh@cl.cam.ac.uk)
@@ -19563,7 +19563,7 @@
+ *
+ */
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/suni.c Tue Feb 9 15:49:57 1999
++++ work/drivers/atm/suni.c Thu Jun 3 01:00:40 1999
@@ -0,0 +1,303 @@
+/* drivers/atm/suni.c - PMC SUNI (PHY) driver */
+
@@ -19869,7 +19869,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/suni.h Thu Jun 3 00:26:39 1999
++++ work/drivers/atm/suni.h Thu Jun 3 01:19:59 1999
@@ -0,0 +1,210 @@
+/* drivers/atm/suni.h - PMC SUNI (PHY) declarations */
+
@@ -20082,7 +20082,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/tonga.h Tue Feb 9 15:49:57 1999
++++ work/drivers/atm/tonga.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,20 @@
+/* drivers/atm/tonga.h - Efficient Networks Tonga (PCI bridge) declarations */
+
@@ -20105,7 +20105,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/uPD98401.h Tue Feb 9 15:49:57 1999
++++ work/drivers/atm/uPD98401.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,292 @@
+/* drivers/atm/uPD98401.h - NEC uPD98401 (SAR) declarations */
+
@@ -20400,7 +20400,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/uPD98402.c Tue Feb 9 15:49:57 1999
++++ work/drivers/atm/uPD98402.c Thu Jun 3 01:00:40 1999
@@ -0,0 +1,225 @@
+/* drivers/atm/uPD98402.c - NEC uPD98402 (PHY) declarations */
+
@@ -20628,7 +20628,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/uPD98402.h Tue Feb 9 15:49:57 1999
++++ work/drivers/atm/uPD98402.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,106 @@
+/* drivers/atm/uPD98402.h - NEC uPD98402 (PHY) declarations */
+
@@ -20737,7 +20737,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/zatm.c Thu Mar 25 16:32:15 1999
++++ work/drivers/atm/zatm.c Thu Jun 3 01:00:40 1999
@@ -0,0 +1,1877 @@
+/* drivers/atm/zatm.c - ZeitNet ZN122x device driver */
+
@@ -22617,7 +22617,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/zatm.h Thu Jun 3 00:26:47 1999
++++ work/drivers/atm/zatm.h Thu Jun 3 01:20:06 1999
@@ -0,0 +1,137 @@
+/* drivers/atm/zatm.h - ZeitNet ZN122x device driver declarations */
+
@@ -22757,7 +22757,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/drivers/atm/zeprom.h Tue Feb 9 15:49:57 1999
++++ work/drivers/atm/zeprom.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,34 @@
+/* drivers/atm/zeprom.h - ZeitNet ZN122x EEPROM (NM93C46) declarations */
+
@@ -22793,8 +22793,8 @@
+/* No other commands are needed. */
+
+#endif
---- ref/drivers/block/genhd.c Sat Jan 9 07:54:17 1999
-+++ work/drivers/block/genhd.c Tue Feb 9 15:49:57 1999
+--- ref/drivers/block/genhd.c Tue Apr 13 01:18:27 1999
++++ work/drivers/block/genhd.c Thu Jun 3 01:00:40 1999
@@ -60,6 +60,7 @@
extern int blk_dev_init(void);
extern int scsi_dev_init(void);
@@ -22803,7 +22803,7 @@
#ifdef CONFIG_PPC
extern void note_bootable_part(kdev_t dev, int part);
-@@ -1310,6 +1311,9 @@
+@@ -1349,6 +1350,9 @@
#endif
#ifdef CONFIG_INET
net_dev_init();
@@ -22814,7 +22814,7 @@
#ifdef CONFIG_VT
console_map_init();
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/arequipa.h Thu Jun 3 00:27:20 1999
++++ work/include/linux/arequipa.h Thu Jun 3 01:26:02 1999
@@ -0,0 +1,63 @@
+/* arequipa.h - Arequipa interface definitions */
+
@@ -22880,7 +22880,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atm.h Thu Jun 3 00:24:32 1999
++++ work/include/linux/atm.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,244 @@
+/* atm.h - general ATM declarations */
+
@@ -23127,7 +23127,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atm_eni.h Tue Feb 9 18:04:33 1999
++++ work/include/linux/atm_eni.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,15 @@
+/* atm_eni.h - Driver-specific declarations of the ENI driver (for use by
+ driver-specific utilities) */
@@ -23145,7 +23145,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atm_nicstar.h Tue Feb 9 15:49:57 1999
++++ work/include/linux/atm_nicstar.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,52 @@
+/******************************************************************************
+ *
@@ -23200,7 +23200,7 @@
+
+#endif /* LINUX_ATM_NICSTAR_H */
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atm_suni.h Tue Feb 9 18:04:31 1999
++++ work/include/linux/atm_suni.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,19 @@
+/* atm_suni.h - Driver-specific declarations of the SUNI driver (for use by
+ driver-specific utilities) */
@@ -23222,7 +23222,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atm_tcp.h Tue Feb 9 15:49:58 1999
++++ work/include/linux/atm_tcp.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,46 @@
+/* atm_tcp.h - Driver-specific declarations of the ATMTCP driver (for use by
+ driver-specific utilities) */
@@ -23271,7 +23271,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atm_zatm.h Tue Feb 9 15:49:58 1999
++++ work/include/linux/atm_zatm.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,54 @@
+/* atm_zatm.h - Driver-specific declarations of the ZATM driver (for use by
+ driver-specific utilities) */
@@ -23328,7 +23328,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atmarp.h Tue Feb 9 15:49:58 1999
++++ work/include/linux/atmarp.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,42 @@
+/* atmarp.h - ATM ARP protocol and kernel-demon interface definitions */
+
@@ -23373,7 +23373,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atmclip.h Tue Feb 9 15:49:58 1999
++++ work/include/linux/atmclip.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,25 @@
+/* atmclip.h - Classical IP over ATM */
+
@@ -23401,7 +23401,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atmdev.h Thu Jun 3 00:26:39 1999
++++ work/include/linux/atmdev.h Thu Jun 3 01:19:59 1999
@@ -0,0 +1,363 @@
+/* atmdev.h - ATM device driver declarations and various related items */
+
@@ -23767,7 +23767,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atmioc.h Tue Feb 9 15:49:58 1999
++++ work/include/linux/atmioc.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,39 @@
+/* atmioc.h - ranges for ATM-related ioctl numbers */
+
@@ -23809,7 +23809,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atmlec.h Thu Jun 3 00:27:20 1999
++++ work/include/linux/atmlec.h Thu Jun 3 01:13:46 1999
@@ -0,0 +1,85 @@
+/*
+ *
@@ -23864,7 +23864,7 @@
+ unsigned long flush_timeout;
+ unsigned long path_switching_delay;
+ unsigned int lane_version; /* LANE2: 1 for LANEv1, 2 for LANEv2 */
-+ int is_proxy; /* bridging support */
++ int mtu;
+};
+
+struct atmlec_msg {
@@ -23897,7 +23897,7 @@
+};
+#endif /* _ATMLEC_H_ */
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atmmpc.h Thu Jun 3 00:27:20 1999
++++ work/include/linux/atmmpc.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,124 @@
+#ifndef _ATMMPC_H_
+#define _ATMMPC_H_
@@ -24024,7 +24024,7 @@
+#endif /* _ATMMPC_H_ */
+
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atmsap.h Tue Feb 9 15:49:58 1999
++++ work/include/linux/atmsap.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,161 @@
+/* atmsap.h - ATM Service Access Point addressing definitions */
+
@@ -24188,7 +24188,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/atmsvc.h Thu Jun 3 00:27:20 1999
++++ work/include/linux/atmsvc.h Thu Jun 3 01:00:40 1999
@@ -0,0 +1,53 @@
+/* atmsvc.h - ATM signaling kernel-demon interface definitions */
+
@@ -24243,8 +24243,8 @@
+ (tp).min_pcr ? (tp).min_pcr : ATM_MAX_PCR)
+
+#endif
---- ref/include/linux/capability.h Thu Jan 28 21:43:10 1999
-+++ work/include/linux/capability.h Tue Feb 9 18:02:00 1999
+--- ref/include/linux/capability.h Tue May 11 19:35:45 1999
++++ work/include/linux/capability.h Thu Jun 3 01:16:56 1999
@@ -131,6 +131,7 @@
#define CAP_LINUX_IMMUTABLE 9
@@ -24261,8 +24261,8 @@
#define CAP_NET_ADMIN 12
---- ref/include/linux/if_arp.h Thu Jan 28 21:43:16 1999
-+++ work/include/linux/if_arp.h Thu Apr 22 17:24:49 1999
+--- ref/include/linux/if_arp.h Tue May 11 19:36:40 1999
++++ work/include/linux/if_arp.h Thu Jun 3 01:18:26 1999
@@ -35,6 +35,7 @@
#define ARPHRD_ARCNET 7 /* ARCnet */
#define ARPHRD_APPLETLK 8 /* APPLEtalk */
@@ -24271,7 +24271,7 @@
#define ARPHRD_METRICOM 23 /* Metricom STRIP (new IANA id) */
/* Dummy types for non ARP hardware */
-@@ -72,6 +73,9 @@
+@@ -79,6 +80,9 @@
#define ARPOP_REPLY 2 /* ARP reply */
#define ARPOP_RREQUEST 3 /* RARP request */
#define ARPOP_RREPLY 4 /* RARP reply */
@@ -24282,7 +24282,7 @@
/* ARP ioctl request. */
--- ref/include/linux/pkt_sched.h Tue Apr 28 20:10:10 1998
-+++ work/include/linux/pkt_sched.h Thu Feb 18 17:44:50 1999
++++ work/include/linux/pkt_sched.h Thu Jun 3 01:00:41 1999
@@ -274,4 +274,18 @@
#define TCA_CBQ_MAX TCA_CBQ_POLICE
@@ -24302,8 +24302,8 @@
+#define TCA_ATM_MAX TCA_ATM_STATE
+
#endif
---- ref/include/linux/skbuff.h Thu Jan 28 21:43:15 1999
-+++ work/include/linux/skbuff.h Thu Apr 22 17:23:33 1999
+--- ref/include/linux/skbuff.h Thu May 13 19:33:17 1999
++++ work/include/linux/skbuff.h Thu Jun 3 01:16:59 1999
@@ -112,6 +112,25 @@
__u32 ifield;
} private;
@@ -24331,7 +24331,7 @@
/* These are just the default values. This is run time configurable.
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/linux/sonet.h Tue Feb 9 15:49:58 1999
++++ work/include/linux/sonet.h Thu Jun 3 01:00:41 1999
@@ -0,0 +1,52 @@
+/* sonet.h - SONET/SHD physical layer control */
+
@@ -24386,7 +24386,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/include/net/atmclip.h Thu Jun 3 00:27:13 1999
++++ work/include/net/atmclip.h Thu Jun 3 01:24:24 1999
@@ -0,0 +1,62 @@
+/* net/atm/atmarp.h - RFC1577 ATM ARP */
+
@@ -24450,10 +24450,10 @@
+int clip_encap(struct atm_vcc *vcc,int mode);
+
+#endif
---- ref/include/net/sock.h Thu Jan 28 21:43:16 1999
-+++ work/include/net/sock.h Thu Apr 22 17:24:52 1999
-@@ -81,6 +81,10 @@
- #include <net/dn.h>
+--- ref/include/net/sock.h Tue May 11 19:36:44 1999
++++ work/include/net/sock.h Thu Jun 3 01:18:30 1999
+@@ -85,6 +85,10 @@
+ #include <net/irda/irda.h>
#endif
+#if defined(CONFIG_ATM) || defined(CONFIG_ATM_MODULE)
@@ -24463,7 +24463,7 @@
#ifdef CONFIG_FILTER
#include <linux/filter.h>
#endif
-@@ -492,6 +496,9 @@
+@@ -495,6 +499,9 @@
#endif
#if defined(CONFIG_ECONET) || defined(CONFIG_ECONET_MODULE)
struct econet_opt *af_econet;
@@ -24471,11 +24471,11 @@
+#if defined(CONFIG_ATM) || defined(CONFIG_ATM_MODULE)
+ struct atm_vcc *af_atm;
#endif
- } protinfo;
-
---- ref/net/Config.in Tue Dec 29 20:21:49 1998
-+++ work/net/Config.in Tue Feb 9 15:49:58 1999
-@@ -25,6 +25,27 @@
+ #if defined(CONFIG_IRDA) || defined(CONFIG_IRDA_MODULE)
+ struct irda_sock *irda;
+--- ref/net/Config.in Thu Feb 25 19:46:47 1999
++++ work/net/Config.in Thu Jun 3 01:00:41 1999
+@@ -24,6 +24,27 @@
fi
fi
fi
@@ -24503,8 +24503,8 @@
comment ' '
tristate 'The IPX protocol' CONFIG_IPX
---- ref/net/Makefile Thu Dec 17 18:03:57 1998
-+++ work/net/Makefile Tue Feb 9 15:49:58 1999
+--- ref/net/Makefile Mon Mar 22 20:18:17 1999
++++ work/net/Makefile Thu Jun 3 01:00:41 1999
@@ -10,7 +10,7 @@
MOD_SUB_DIRS := ipv4
ALL_SUB_DIRS := 802 ax25 bridge core ethernet ipv4 ipv6 ipx unix appletalk \
@@ -24514,7 +24514,7 @@
SUB_DIRS := core ethernet sched
MOD_LIST_NAME := NET_MISC_MODULES
-@@ -139,6 +139,17 @@
+@@ -143,6 +143,17 @@
ifeq ($(CONFIG_SUNRPC),m)
MOD_SUB_DIRS += sunrpc
endif
@@ -24532,9 +24532,9 @@
endif
ifeq ($(CONFIG_DECNET),y)
---- ref/net/netsyms.c Thu Jan 7 18:26:42 1999
-+++ work/net/netsyms.c Tue Feb 9 17:15:25 1999
-@@ -214,6 +214,8 @@
+--- ref/net/netsyms.c Sun Apr 25 02:51:48 1999
++++ work/net/netsyms.c Thu Jun 3 01:00:41 1999
+@@ -220,6 +220,8 @@
#ifdef CONFIG_BRIDGE
EXPORT_SYMBOL(br_ioctl);
@@ -24544,7 +24544,7 @@
#ifdef CONFIG_INET
--- ref/net/protocols.c Thu Dec 17 18:03:57 1998
-+++ work/net/protocols.c Tue Feb 9 15:49:58 1999
++++ work/net/protocols.c Thu Jun 3 01:00:41 1999
@@ -87,6 +87,10 @@
extern void rif_init(struct net_proto *);
#endif
@@ -24568,8 +24568,8 @@
#ifdef NEED_LLC
{ "802.2LLC", llc_init }, /* 802.2 LLC */
---- ref/net/ipv4/arp.c Wed Nov 18 18:06:05 1998
-+++ work/net/ipv4/arp.c Tue Feb 9 15:49:58 1999
+--- ref/net/ipv4/arp.c Sun Mar 21 16:22:00 1999
++++ work/net/ipv4/arp.c Thu Jun 3 01:02:32 1999
@@ -115,6 +115,9 @@
#include <net/netrom.h>
#endif
@@ -24580,21 +24580,21 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-@@ -402,7 +405,11 @@
- if (dev == NULL)
- return 0;
- if (dst->neighbour == NULL)
-- dst->neighbour = __neigh_lookup(&arp_tbl, &((struct rtable*)dst)->rt_gateway, dev, 1);
+@@ -405,7 +408,11 @@
+ u32 nexthop = ((struct rtable*)dst)->rt_gateway;
+ if (dev->flags&(IFF_LOOPBACK|IFF_POINTOPOINT))
+ nexthop = 0;
+- dst->neighbour = __neigh_lookup(&arp_tbl, &nexthop, dev, 1);
+ dst->neighbour = __neigh_lookup(
+#ifdef CONFIG_ATM_CLIP
+ dev->type == ARPHRD_ATM ? &clip_tbl :
+#endif
-+ &arp_tbl, &((struct rtable*)dst)->rt_gateway, dev, 1);
++ &arp_tbl, &nexthop, dev, 1);
+ }
return (dst->neighbour != NULL);
}
-
---- ref/net/sched/Config.in Thu May 14 19:26:23 1998
-+++ work/net/sched/Config.in Tue Feb 9 15:49:58 1999
+--- ref/net/sched/Config.in Sun Mar 21 16:22:00 1999
++++ work/net/sched/Config.in Thu Jun 3 01:00:42 1999
@@ -7,6 +7,9 @@
tristate 'CSZ packet scheduler' CONFIG_NET_SCH_CSZ
#tristate 'H-PFQ packet scheduler' CONFIG_NET_SCH_HPFQ
@@ -24605,8 +24605,8 @@
tristate 'The simplest PRIO pseudoscheduler' CONFIG_NET_SCH_PRIO
tristate 'RED queue' CONFIG_NET_SCH_RED
tristate 'SFQ queue' CONFIG_NET_SCH_SFQ
---- ref/net/sched/Makefile Tue Apr 28 20:10:11 1998
-+++ work/net/sched/Makefile Tue Feb 9 15:49:58 1999
+--- ref/net/sched/Makefile Sun Mar 21 16:22:00 1999
++++ work/net/sched/Makefile Thu Jun 3 01:00:42 1999
@@ -7,6 +7,8 @@
#
# Note 2! The CFLAGS definition is now in the main makefile...
@@ -24627,9 +24627,9 @@
endif
ifeq ($(CONFIG_NET_CLS_U32), y)
---- ref/net/sched/sch_api.c Thu Jan 7 18:26:42 1999
-+++ work/net/sched/sch_api.c Tue Feb 9 15:49:58 1999
-@@ -987,6 +987,9 @@
+--- ref/net/sched/sch_api.c Sun Mar 21 16:22:00 1999
++++ work/net/sched/sch_api.c Thu Jun 3 01:00:42 1999
+@@ -1150,6 +1150,9 @@
#ifdef CONFIG_NET_SCH_PRIO
INIT_QDISC(prio);
#endif
@@ -24640,8 +24640,8 @@
tc_filter_init();
#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/sched/sch_atm.c Mon Mar 1 16:03:42 1999
-@@ -0,0 +1,625 @@
++++ work/net/sched/sch_atm.c Thu Jun 3 02:05:55 1999
+@@ -0,0 +1,643 @@
+/* net/sched/sch_atm.c - ATM VC selection "queueing discipline" */
+
+/* Written 1998,1999 by Werner Almesberger, EPFL ICA */
@@ -24766,6 +24766,15 @@
+}
+
+
++static struct Qdisc *atm_tc_leaf(struct Qdisc *sch,unsigned long cl)
++{
++ struct atm_flow_data *flow = (struct atm_flow_data *) cl;
++
++ DPRINTK("atm_tc_leaf(sch %p,flow %p)\n",sch,flow);
++ return flow ? flow->q : NULL;
++}
++
++
+static unsigned long atm_tc_get(struct Qdisc *sch,u32 classid)
+{
+ struct atm_qdisc_data *p = PRIV(sch);
@@ -24779,6 +24788,13 @@
+}
+
+
++static unsigned long atm_tc_bind_filter(struct Qdisc *sch,
++ unsigned long parent, u32 classid)
++{
++ return atm_tc_get(sch,classid);
++}
++
++
+/*
+ * atm_tc_put handles all destructions, including the ones that are explicitly
+ * requested (atm_tc_destroy, etc.). The assumption here is that we never drop
@@ -25218,6 +25234,7 @@
+static struct Qdisc_class_ops atm_class_ops =
+{
+ atm_tc_graft, /* graft */
++ atm_tc_leaf, /* leaf */
+ atm_tc_get, /* get */
+ atm_tc_put, /* put */
+ atm_tc_change, /* change */
@@ -25225,7 +25242,7 @@
+ atm_tc_walk, /* walk */
+
+ atm_tc_find_tcf, /* tcf_chain */
-+ atm_tc_get, /* bind_tcf */
++ atm_tc_bind_filter, /* bind_tcf */
+ atm_tc_put, /* unbind_tcf */
+
+#ifdef CONFIG_RTNETLINK
@@ -25248,6 +25265,7 @@
+ atm_tc_init, /* init */
+ atm_tc_reset, /* reset */
+ atm_tc_destroy, /* destroy */
++ NULL, /* change */
+
+#ifdef CONFIG_RTNETLINK
+ atm_tc_dump /* dump */
@@ -25267,18 +25285,18 @@
+ unregister_qdisc(&atm_qdisc_ops);
+}
+#endif
---- ref/net/802/tr.c Wed Dec 16 22:35:50 1998
-+++ work/net/802/tr.c Wed Jun 2 23:36:00 1999
-@@ -51,7 +51,7 @@
+--- ref/net/802/tr.c Sun Apr 25 02:51:48 1999
++++ work/net/802/tr.c Thu Jun 3 01:05:18 1999
+@@ -50,7 +50,7 @@
struct rif_cache_s {
unsigned char addr[TR_ALEN];
- unsigned char iface[5];
-+ unsigned char iface[10];
++ unsigned char iface[9];
__u16 rcf;
__u16 rseg[8];
rif_cache next;
-@@ -354,7 +354,8 @@
+@@ -365,7 +365,8 @@
}
memcpy(&(entry->addr[0]),&(trh->saddr[0]),TR_ALEN);
@@ -25289,7 +25307,7 @@
entry->last_used=jiffies;
rif_table[hash]=entry;
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/Makefile Thu May 6 10:50:28 1999
++++ work/net/atm/Makefile Thu Jun 3 01:00:42 1999
@@ -0,0 +1,68 @@
+#
+# Makefile for the ATM Protocol Families.
@@ -25360,7 +25378,7 @@
+mpoa.o: mpc.o mpoa_caches.o mpoa_proc.o
+ ld -r -o mpoa.o mpc.o mpoa_caches.o mpoa_proc.o
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/addr.c Tue Feb 9 15:49:58 1999
++++ work/net/atm/addr.c Thu Jun 3 01:00:42 1999
@@ -0,0 +1,159 @@
+/* net/atm/addr.c - Local ATM address registry */
+
@@ -25522,7 +25540,7 @@
+ return total;
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/addr.h Thu Jun 3 00:27:20 1999
++++ work/net/atm/addr.h Thu Jun 3 01:26:02 1999
@@ -0,0 +1,18 @@
+/* net/atm/addr.h - Local ATM address registry */
+
@@ -25543,7 +25561,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/clip.c Thu Apr 22 19:29:21 1999
++++ work/net/atm/clip.c Thu Jun 3 01:00:42 1999
@@ -0,0 +1,688 @@
+/* net/atm/clip.c - RFC1577 Classical IP over ATM */
+
@@ -26234,7 +26252,7 @@
+ return 0;
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/common.c Thu Jun 3 00:10:44 1999
++++ work/net/atm/common.c Thu Jun 3 01:00:42 1999
@@ -0,0 +1,936 @@
+/* net/atm/common.c - ATM sockets (common part for PVC and SVC) */
+
@@ -27173,7 +27191,7 @@
+ return atm_do_getsockopt(sock,level,optname,optval,len);
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/common.h Thu Apr 22 17:31:28 1999
++++ work/net/atm/common.h Thu Jun 3 01:26:02 1999
@@ -0,0 +1,46 @@
+/* net/atm/common.h - ATM sockets (common part for PVC and SVC) */
+
@@ -27222,7 +27240,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/ipcommon.c Tue Feb 9 15:49:58 1999
++++ work/net/atm/ipcommon.c Thu Jun 3 01:00:42 1999
@@ -0,0 +1,52 @@
+/* net/atm/ipcommon.c - Common items for all ways of doing IP over ATM */
+
@@ -27277,7 +27295,7 @@
+ skb_queue_head_init(from);
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/ipcommon.h Thu Jun 3 00:27:26 1999
++++ work/net/atm/ipcommon.h Thu Jun 3 01:26:08 1999
@@ -0,0 +1,21 @@
+/* net/atm/ipcommon.h - Common items for all ways of doing IP over ATM */
+
@@ -27301,7 +27319,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/atm_misc.c Thu Apr 22 19:33:49 1999
++++ work/net/atm/atm_misc.c Thu Jun 3 01:00:42 1999
@@ -0,0 +1,124 @@
+/* net/atm/atm_misc.c - Various functions for use by ATM drivers */
+
@@ -27428,8 +27446,8 @@
+EXPORT_SYMBOL(atm_find_ci);
+EXPORT_SYMBOL(atm_pcr_goal);
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/lec.c Wed Jun 2 23:36:00 1999
-@@ -0,0 +1,2180 @@
++++ work/net/atm/lec.c Thu Jun 3 01:13:03 1999
+@@ -0,0 +1,2182 @@
+/*
+ * lec.c: Lan Emulation driver
+ * Marko Kiiskila carnil@cs.tut.fi
@@ -27891,7 +27909,9 @@
+ priv->lane2_ops = NULL;
+ if (priv->lane_version > 1)
+ priv->lane2_ops = &lane2_ops;
-+ priv->is_proxy = mesg->content.config.is_proxy;
++ if (dev->change_mtu(dev, mesg->content.config.mtu))
++ printk("%s: change_mtu to %d failed\n", dev->name,
++ mesg->content.config.mtu);
+ break;
+ case l_flush_tran_id:
+ lec_set_flush_tran_id(priv, mesg->content.normal.atm_addr,
@@ -29611,7 +29631,7 @@
+}
+
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/lec.h Thu Jun 3 00:27:20 1999
++++ work/net/atm/lec.h Thu Jun 3 01:26:02 1999
@@ -0,0 +1,150 @@
+/*
+ *
@@ -29764,7 +29784,7 @@
+#endif _LEC_H_
+
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/lec_arpc.h Thu Jun 3 00:27:20 1999
++++ work/net/atm/lec_arpc.h Thu Jun 3 01:26:02 1999
@@ -0,0 +1,116 @@
+/*
+ * Lec arp cache
@@ -29883,7 +29903,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/mpc.c Wed Jun 2 23:36:00 1999
++++ work/net/atm/mpc.c Thu Jun 3 01:00:43 1999
@@ -0,0 +1,1470 @@
+#include <linux/kernel.h>
+#include <linux/string.h>
@@ -31356,7 +31376,7 @@
+}
+#endif /* MODULE */
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/mpc.h Thu Jun 3 00:27:20 1999
++++ work/net/atm/mpc.h Thu Jun 3 01:26:02 1999
@@ -0,0 +1,65 @@
+#ifndef _MPC_H_
+#define _MPC_H_
@@ -31424,7 +31444,7 @@
+
+#endif /* _MPC_H_ */
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/mpoa_caches.c Tue May 18 00:41:41 1999
++++ work/net/atm/mpoa_caches.c Thu Jun 3 01:00:43 1999
@@ -0,0 +1,557 @@
+#include <linux/types.h>
+#include <linux/atmmpc.h>
@@ -31984,7 +32004,7 @@
+ return;
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/mpoa_caches.h Thu Jun 3 00:27:20 1999
++++ work/net/atm/mpoa_caches.h Thu Jun 3 01:26:02 1999
@@ -0,0 +1,90 @@
+#ifndef MPOA_CACHES_H
+#define MPOA_CACHES_H
@@ -32077,7 +32097,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/mpoa_proc.c Tue May 18 00:41:41 1999
++++ work/net/atm/mpoa_proc.c Thu Jun 3 01:00:43 1999
@@ -0,0 +1,391 @@
+#include <linux/config.h>
+
@@ -32471,7 +32491,7 @@
+
+
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/lane_mpoa_init.c Tue Feb 9 15:49:58 1999
++++ work/net/atm/lane_mpoa_init.c Thu Jun 3 01:00:43 1999
@@ -0,0 +1,48 @@
+#include <linux/config.h>
+#include <linux/module.h>
@@ -32522,7 +32542,7 @@
+}
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/proc.c Thu Jun 3 00:20:33 1999
++++ work/net/atm/proc.c Thu Jun 3 01:00:43 1999
@@ -0,0 +1,617 @@
+/* net/atm/proc.c - ATM /proc interface */
+
@@ -33142,7 +33162,7 @@
+ return error;
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/protocols.h Tue Feb 9 15:49:58 1999
++++ work/net/atm/protocols.h Thu Jun 3 01:00:43 1999
@@ -0,0 +1,16 @@
+/* net/atm/protocols.h - ATM protocol handler entry points */
+
@@ -33161,7 +33181,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/pvc.c Wed Apr 21 18:32:11 1999
++++ work/net/atm/pvc.c Thu Jun 3 01:00:43 1999
@@ -0,0 +1,158 @@
+/* net/atm/pvc.c - ATM PVC sockets */
+
@@ -33322,7 +33342,7 @@
+#endif
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/raw.c Tue Feb 9 15:49:58 1999
++++ work/net/atm/raw.c Thu Jun 3 01:00:43 1999
@@ -0,0 +1,80 @@
+/* net/atm/raw.c - Raw AAL0 and AAL5 transports */
+
@@ -33405,7 +33425,7 @@
+ return 0;
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/resources.c Thu Mar 25 16:31:28 1999
++++ work/net/atm/resources.c Thu Jun 3 01:00:43 1999
@@ -0,0 +1,202 @@
+/* net/atm/resources.c - Staticly allocated resources */
+
@@ -33610,7 +33630,7 @@
+EXPORT_SYMBOL(shutdown_atm_dev);
+EXPORT_SYMBOL(bind_vcc);
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/resources.h Thu Jun 3 00:27:20 1999
++++ work/net/atm/resources.h Thu Jun 3 01:26:02 1999
@@ -0,0 +1,32 @@
+/* net/atm/resources.h - ATM-related resources */
+
@@ -33645,7 +33665,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/signaling.c Thu Apr 22 19:35:29 1999
++++ work/net/atm/signaling.c Thu Jun 3 01:00:43 1999
@@ -0,0 +1,252 @@
+/* net/atm/signaling.c - ATM signaling */
+
@@ -33900,7 +33920,7 @@
+ return 0;
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/signaling.h Thu Jun 3 00:27:20 1999
++++ work/net/atm/signaling.h Thu Jun 3 01:26:02 1999
@@ -0,0 +1,25 @@
+/* net/atm/signaling.h - ATM signaling */
+
@@ -33928,7 +33948,7 @@
+
+#endif
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/svc.c Wed Apr 21 18:32:01 1999
++++ work/net/atm/svc.c Thu Jun 3 01:00:43 1999
@@ -0,0 +1,389 @@
+/* net/atm/svc.c - ATM SVC sockets */
+
@@ -34320,7 +34340,7 @@
+ }
+}
--- /dev/null Tue Jan 1 05:00:00 1980
-+++ work/net/atm/tunable.h Thu Apr 22 19:33:00 1999
++++ work/net/atm/tunable.h Thu Jun 3 01:00:43 1999
@@ -0,0 +1,23 @@
+/* net/atm/tunable.h - Tunable parameters of ATM support */
+
@@ -34345,8 +34365,8 @@
+#define ATM_TXBQ_MAX (1024*1024) /* TX buffer quota limit, in bytes */
+
+#endif
---- ref/net/core/skbuff.c Tue Sep 15 07:52:10 1998
-+++ work/net/core/skbuff.c Tue Feb 9 15:49:58 1999
+--- ref/net/core/skbuff.c Sun Mar 7 19:12:18 1999
++++ work/net/core/skbuff.c Thu Jun 3 01:00:43 1999
@@ -61,6 +61,10 @@
#include <asm/uaccess.h>
#include <asm/system.h>
diff -ur --new-file old/atm/doc/usage.tex new/atm/doc/usage.tex
--- old/atm/doc/usage.tex Wed Jun 2 23:55:42 1999
+++ new/atm/doc/usage.tex Thu Jun 3 01:03:45 1999
@@ -1,7 +1,7 @@
%def%:=
%:\begin{verbatim}
-%:Usage instructions - ATM on Linux, release 0.58
+%:Usage instructions - ATM on Linux, release 0.59
%:-------------------------------------------------
%:
%:\end{verbatim}
@@ -38,7 +38,7 @@
\title{ATM on Linux \\
User's guide \\
- Release 0.58 (alpha)}
+ Release 0.59 (alpha)}
\author{Werner Almesberger \\
{\tt Werner.Almesberger@epfl.ch} \\
\\
@@ -82,9 +82,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.58.tar.gz}
- \item the Linux kernel, version 2.2.1, e.g. from
- \url{ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.2.1.tar.gz}
+ \url{ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.59.tar.gz}
+ \item the Linux kernel, version 2.2.9, e.g. from
+ \url{ftp://ftp.kernel.org/pub/linux/kernel/v2.2/linux-2.2.9.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}
@@ -99,13 +99,13 @@
distribution:
\begin{verbatim}
-tar xfz atm-0.58.tar.gz
+tar xfz atm-0.59.tar.gz
\end{verbatim}
and the kernel source:
\begin{verbatim}
-tar xfz linux-2.2.1.tar.gz
+tar xfz linux-2.2.9.tar.gz
\end{verbatim}
Finally, you can extract the ATM-related patches:
@@ -999,12 +999,10 @@
an proxy LEC. These parameters can be tailored with command line
options which are defined in \name{zeppelin.8}.
-\name{zeppelin}, will automatically join any
-ELANs which use higher MTU than the default MTU of 1516
-bytes. However, the MTU of the LANE interface will not change before
-you use \raw{ifconfig} to adjust it. This will probably change later
-so that the interface MTU will adjust itself according to the MTU of
-the current ELAN.
+\name{zeppelin} will automatically join any ELANs which use higher
+MTU than the default MTU of 1516 bytes. The MTU of the LANE
+interface will adjust itself according to the MTU of the current
+ELAN.
The state of the LANE ARP cache entries can be monitored through
\path{/proc/atm/lec}. For each entry the MAC and ATM addresses and status
diff -ur --new-file old/atm/doc/usage.txt new/atm/doc/usage.txt
--- old/atm/doc/usage.txt Thu Jun 3 00:23:59 1999
+++ new/atm/doc/usage.txt Thu Jun 3 02:07:20 1999
@@ -1,4 +1,4 @@
-%:Usage instructions - ATM on Linux, release 0.58
+%:Usage instructions - ATM on Linux, release 0.59
%:-------------------------------------------------
%:
%:
@@ -20,9 +20,9 @@
In order to install this package, you need
- the package itself
- ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.58.tar.gz
- - the Linux kernel, version 2.2.1, e.g. from
- ftp://ftp.kernel.org/pub/linux/kernel/v2.1/linux-2.2.1.tar.gz
+ ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-0.59.tar.gz
+ - the Linux kernel, version 2.2.9, e.g. from
+ ftp://ftp.kernel.org/pub/linux/kernel/v2.2/linux-2.2.9.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
@@ -36,11 +36,11 @@
all the files listed above there. Then extract the ATM on Linux
distribution:
-tar xfz atm-0.58.tar.gz
+tar xfz atm-0.59.tar.gz
and the kernel source:
-tar xfz linux-2.2.1.tar.gz
+tar xfz linux-2.2.9.tar.gz
Finally, you can extract the ATM-related patches:
@@ -825,11 +825,9 @@
parameters can be tailored with command line options which are defined in
zeppelin.8.
-zeppelin, will automatically join any ELANs which use higher MTU than the
-default MTU of 1516 bytes. However, the MTU of the LANE interface will not
-change before you use ifconfig to adjust it. This will probably change
-later so that the interface MTU will adjust itself according to the MTU of
-the current ELAN.
+zeppelin will automatically join any ELANs which use higher MTU than the
+default MTU of 1516 bytes. The MTU of the LANE interface will adjust itself
+according to the MTU of the current ELAN.
The state of the LANE ARP cache entries can be monitored through
/proc/atm/lec. For each entry the MAC and ATM addresses and status is
diff -ur --new-file old/atm/led/conn.c new/atm/led/conn.c
--- old/atm/led/conn.c Wed Jun 2 23:36:53 1999
+++ new/atm/led/conn.c Thu Jun 3 01:07:03 1999
@@ -907,6 +907,35 @@
return sdu;
}
+int maxmtu2itfmtu(uint8_t mtu)
+{
+
+ int sdu;
+
+ switch (mtu) {
+ case MTU_1516:
+ sdu = 1500;
+ break;
+ case MTU_1580: /* LANE2: MTU can be 1580 too (IEEE 802.1p/Q) */
+ sdu = 1500;
+ break;
+ case MTU_4544:
+ sdu = 4550;
+ break;
+ case MTU_9234:
+ sdu = 9180;
+ break;
+ case MTU_18190:
+ sdu = 18200;
+ break;
+ default:
+ sdu = 1500;
+ break;
+ }
+
+ return sdu;
+}
+
/* Convert a type of connection (CONTROL_CONN, DATA_DIRECT and MCAST_CONN)
* to a BLLI codepoint which depends on C2 LAN Type.
*/
diff -ur --new-file old/atm/led/conn.h new/atm/led/conn.h
--- old/atm/led/conn.h Wed Jun 2 23:36:53 1999
+++ new/atm/led/conn.h Thu Jun 3 01:07:03 1999
@@ -63,6 +63,8 @@
int conn_set_kernel_socket(int fd);
void random_delay(void);
+int maxmtu2itfmtu(uint8_t mtu);
+
/*
* Connection types for BLLI codepoints.
*/
diff -ur --new-file old/atm/led/main.c new/atm/led/main.c
--- old/atm/led/main.c Wed Jun 2 23:36:55 1999
+++ new/atm/led/main.c Thu Jun 3 01:06:18 1999
@@ -164,6 +164,7 @@
msg.content.config.flush_timeout = lec_params.c21_flush_timeout;
msg.content.config.path_switching_delay = lec_params.c22_path_switching_delay;
msg.content.config.lane_version = (lec_params.c29_v2_capable) ? 2 : 1;
+ msg.content.config.mtu = maxmtu2itfmtu(lec_params.c3_max_frame_size);
if (msg_to_kernel(&msg, sizeof(struct atmlec_msg)) < 0) {
diag(COMPONENT, DIAG_ERROR, "Could not tell kernel ELAN parameters\n");