diff -ur --new-file old/atm/.kernel new/atm/.kernel --- old/atm/.kernel Mon Jan 31 11:34:39 2000 +++ new/atm/.kernel Wed Feb 2 21:35:15 2000 @@ -1,2 +1,2 @@ # this file is used to control automated generation of differences -2.3.41 +2.3.42 diff -ur --new-file old/atm/CHANGES new/atm/CHANGES --- old/atm/CHANGES Mon Jan 31 15:58:28 2000 +++ new/atm/CHANGES Wed Feb 2 22:52:23 2000 @@ -1,3 +1,21 @@ +Version 0.66 to 0.67 (2-FEB-2000) +==================== + +New features +------------ + + - upgraded to 2.3.42 + - added sunimode utility to set SUNI loopback mode (by Christophe Lizzi) + +Other changes +------------- + + - removed unused variable warning in net/sched/sch_atm.c + - changed ENI_SETMULT from ATMIOC_SARPRV+1 to ATMIOC_SARPRV+7 + - changed atmarpd's complaint about VCC-less non-ATMARP-server entries from + DIAG_ERROR to DIAG_INFO (the condition is okay for an ATMARP server) + + Version 0.65 to 0.66 (31-JAN-2000) ==================== diff -ur --new-file old/atm/README new/atm/README --- old/atm/README Mon Jan 31 14:55:27 2000 +++ new/atm/README Wed Feb 2 20:52:02 2000 @@ -1,4 +1,4 @@ -ATM on Linux, release 0.66 (beta) by Werner Almesberger, EPFL ICA +ATM on Linux, release 0.67 (beta) by Werner Almesberger, EPFL ICA ============================================== Werner.Almesberger@epfl.ch This is experimental software. There are known bugs and certainly even @@ -9,7 +9,7 @@ device drivers, source for demons, management and test tools, and some documentation. -The kernel patch is relative to the 2.3.41 kernel. +The kernel patch is relative to the 2.3.42 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 Mon Jan 31 14:57:14 2000 +++ new/atm/USAGE Wed Feb 2 22:53:12 2000 @@ -1,4 +1,4 @@ -Usage instructions - ATM on Linux, release 0.66 +Usage instructions - ATM on Linux, release 0.67 ------------------------------------------------- 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://icaftp.epfl.ch/pub/linux/atm/dist/atm-0.66.tar.gz - - the Linux kernel, version 2.3.41, e.g. from - ftp://ftp.kernel.org/pub/linux/kernel/v2.3/linux-2.3.41.tar.gz + ftp://icaftp.epfl.ch/pub/linux/atm/dist/atm-0.67.tar.gz + - the Linux kernel, version 2.3.42, e.g. from + ftp://ftp.kernel.org/pub/linux/kernel/v2.3/linux-2.3.42.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.66.tar.gz +tar xfz atm-0.67.tar.gz and the kernel source: -tar xfz linux-2.3.41.tar.gz +tar xfz linux-2.3.42.tar.gz Finally, you can extract the ATM-related patches: @@ -53,7 +53,7 @@ atm/qgen/ Q.2931-style message handling atm/ilmid/ ILMI address registration demon: ilmid atm/maint/ ATM maintenance programs: atmaddr, atmdiag, atmdump, atmtcp, - enitune, esi, sonetdiag, saaldump, and zntune + enitune, esi, sonetdiag, saaldump, sunimode, and zntune atm/test/ Test programs: align, aping, aread, awrite, br, bw, isp, ttcp_atm, window atm/arpd/ ATMARP tools and demon: atmarp, atmarpd @@ -86,7 +86,7 @@ Classical IP over ATM (CONFIG_ATM_CLIP) Do NOT send ICMP if no neighbour (CONFIG_ATM_CLIP_NO_ICMP) LAN Emulation (LANE) support (CONFIG_ATM_LANE) - Multi-Protocol Over ATM (MPOA) support (CONFIG_ATM_MPOA) + Multi-Protocol Over ATM (MPOA) support (CONFIG_ATM_MPOA) ATM over TCP (CONFIG_ATM_TCP) Efficient Networks ENI155P (CONFIG_ATM_ENI) Enable extended debugging (CONFIG_ATM_ENI_DEBUG) @@ -103,6 +103,14 @@ Enable extended debugging (CONFIG_ATM_ZATM_DEBUG) Enable usec resolution timestamps (CONFIG_ATM_ZATM_EXACT_TS) IDT 77201 (NICStAR) (CONFIG_ATM_NICSTAR) + Use suni PHY driver (155Mbps) (CONFIG_ATM_NICSTAR_USE_SUNI) + Use IDT77015 PHY driver (25Mbps) (CONFIG_ATM_NICSTAR_USE_IDT77105) +Madge Ambassador (Collage PCI 155 Server) (CONFIG_ATM_AMBASSADOR) + Enable debugging messages (CONFIG_ATM_AMBASSADOR_DEBUG) +Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client) + Enable debugging messages (CONFIG_ATM_HORIZON_DEBUG) +Interphase ATM PCI x575/x525/x531 (CONFIG_ATM_IA) + Enable debugging messages (CONFIG_ATM_IA_DEBUG) The burst settings of the ENI driver can be fine-tuned. This may be necessary if the default settings lead to buffer overruns in the PCI diff -ur --new-file old/atm/VERSION new/atm/VERSION --- old/atm/VERSION Mon Jan 31 11:34:43 2000 +++ new/atm/VERSION Wed Feb 2 21:35:10 2000 @@ -1 +1 @@ -0.66 +0.67 diff -ur --new-file old/atm/arpd/arp.c new/atm/arpd/arp.c --- old/atm/arpd/arp.c Tue Jan 18 22:34:13 2000 +++ new/atm/arpd/arp.c Wed Feb 2 22:05:52 2000 @@ -336,8 +336,10 @@ case as_invalid: if (entry->vccs) inarp_request(entry); else if (!(entry->flags & ATF_ARPSRV)) - diag(COMPONENT,DIAG_ERROR,"as_invalid, no VCCs, but not " + diag(COMPONENT,DIAG_INFO,"as_invalid, no VCCs, but not " "ARP server entry"); + /* this is a valid condition if we're the ATMARP server + and the remote disconnected */ else if (!want_arp_srv(entry->itf)) STOP_TIMER(entry); break; case as_valid: diff -ur --new-file old/atm/atm.patch new/atm/atm.patch --- old/atm/atm.patch Mon Jan 31 14:53:55 2000 +++ new/atm/atm.patch Wed Feb 2 22:53:03 2000 @@ -1,5 +1,5 @@ ---- ref/CREDITS Tue Jan 25 20:17:07 2000 -+++ work/CREDITS Mon Jan 31 11:38:23 2000 +--- ref/CREDITS Tue Feb 1 08:37:19 2000 ++++ work/CREDITS Wed Feb 2 20:33:04 2000 @@ -24,6 +24,12 @@ S: Iasi 6600 S: Romania @@ -44,7 +44,21 @@ N: James Banks E: james@sovereign.org D: TLAN network driver -@@ -1116,6 +1130,13 @@ +@@ -461,6 +475,13 @@ + S: NN1 3QT + S: United Kingdom + ++N: Uwe Dannowski ++E: Uwe.Dannowski@ira.uka.de ++W: http://i30www.ira.uka.de/~dannowsk/ ++D: FORE PCA-200E driver ++S: University of Karlsruhe ++S: Germany ++ + N: Ray Dassen + E: jdassen@wi.LeidenUniv.nl + W: http://www.wi.leidenuniv.nl/~jdassen/ +@@ -1123,6 +1144,13 @@ S: TW9 1AE S: United Kingdom @@ -58,9 +72,9 @@ N: Russell King E: rmk@arm.uk.linux.org D: Linux/arm integrator, maintainer & hacker -@@ -1306,6 +1327,15 @@ - S: North Little Rock, Arkansas 72115 - S: USA +@@ -1321,6 +1349,15 @@ + S: (ask for current address) + S: Germany +N: Christophe Lizzi +E: lizzi@cnam.fr @@ -74,7 +88,7 @@ N: Siegfried "Frieder" Loeffler (dg1sek) E: floeff@tunix.mathematik.uni-stuttgart.de, fl@LF.net W: http://www.mathematik.uni-stuttgart.de/~floeff -@@ -1744,6 +1774,10 @@ +@@ -1773,6 +1810,10 @@ E: Frederic.Potter@masi.ibp.fr D: Some PCI kernel support @@ -85,7 +99,7 @@ N: Stefan Probst E: sp@caldera.de D: The Linux Support Team Erlangen, 1993-97 -@@ -2311,6 +2345,13 @@ +@@ -2347,6 +2388,13 @@ S: UC Berkeley S: Berkeley, CA 94720-1776 S: USA @@ -99,8 +113,8 @@ N: Greg Wettstein E: greg@wind.rmcc.com ---- ref/Documentation/Configure.help Thu Jan 27 16:40:16 2000 -+++ work/Documentation/Configure.help Mon Jan 31 11:38:23 2000 +--- ref/Documentation/Configure.help Mon Jan 31 19:19:21 2000 ++++ work/Documentation/Configure.help Wed Feb 2 20:33:04 2000 @@ -3839,7 +3839,8 @@ of your ATM card below. @@ -254,7 +268,7 @@ When active, these messages can have a significant impact on the speed of the driver, and the size of your syslog files! When --- ref/Documentation/atm.txt Wed Sep 8 20:14:31 1999 -+++ work/Documentation/atm.txt Mon Jan 31 11:38:23 2000 ++++ work/Documentation/atm.txt Wed Feb 2 20:33:04 2000 @@ -1,8 +0,0 @@ -In order to use anything but the most primitive functions of ATM, -several user-mode programs are required to assist the kernel. These @@ -265,7 +279,7 @@ -on Linux mailing list. Subscription information, archives, etc., -can be found on http://icawww1.epfl.ch/linux-atm/ --- /dev/null Tue May 5 22:32:27 1998 -+++ work/Documentation/networking/atm.txt Mon Jan 31 11:38:23 2000 ++++ work/Documentation/networking/atm.txt Wed Feb 2 20:33:04 2000 @@ -0,0 +1,8 @@ +In order to use anything but the most primitive functions of ATM, +several user-mode programs are required to assist the kernel. These @@ -276,7 +290,7 @@ +on Linux mailing list. Subscription information, archives, etc., +can be found on http://icawww1.epfl.ch/linux-atm/ --- /dev/null Tue May 5 22:32:27 1998 -+++ work/Documentation/networking/fore200e.txt Mon Jan 31 11:38:23 2000 ++++ work/Documentation/networking/fore200e.txt Wed Feb 2 20:33:04 2000 @@ -0,0 +1,47 @@ +Fore PCA-200E/SBA-200E ATM NIC Firmware +--------------------------------------- @@ -326,7 +340,7 @@ +patches/improvement/comments/flames to . + --- /dev/null Tue May 5 22:32:27 1998 -+++ work/Documentation/networking/iphase.txt Mon Jan 31 11:38:23 2000 ++++ work/Documentation/networking/iphase.txt Wed Feb 2 20:33:04 2000 @@ -0,0 +1,158 @@ + + READ ME FISRT @@ -486,8 +500,8 @@ + Fax: 33 (0)1 41 15 12 13 + World Wide Web: http://www.iphase.com + Anonymous FTP: ftp.iphase.com ---- ref/arch/sparc64/config.in Sat Jan 22 03:22:54 2000 -+++ work/arch/sparc64/config.in Mon Jan 31 11:38:23 2000 +--- ref/arch/sparc64/config.in Tue Feb 1 08:37:19 2000 ++++ work/arch/sparc64/config.in Wed Feb 2 20:33:04 2000 @@ -216,6 +216,9 @@ # bool ' FDDI driver support' CONFIG_FDDI # if [ "$CONFIG_FDDI" = "y" ]; then @@ -498,8 +512,8 @@ fi endmenu fi ---- ref/arch/sparc64/kernel/ioctl32.c Sat Jan 22 03:22:54 2000 -+++ work/arch/sparc64/kernel/ioctl32.c Mon Jan 31 11:38:23 2000 +--- ref/arch/sparc64/kernel/ioctl32.c Tue Feb 1 08:37:19 2000 ++++ work/arch/sparc64/kernel/ioctl32.c Wed Feb 2 20:33:04 2000 @@ -61,6 +61,18 @@ #include @@ -796,7 +810,7 @@ goto out; --- ref/drivers/atm/Config.in Thu Oct 7 19:17:09 1999 -+++ work/drivers/atm/Config.in Mon Jan 31 11:38:23 2000 ++++ work/drivers/atm/Config.in Wed Feb 2 20:33:04 2000 @@ -8,7 +8,7 @@ fi if [ "$CONFIG_PCI" = "y" ]; then @@ -867,7 +881,7 @@ fi endmenu --- ref/drivers/atm/Makefile Wed Sep 8 20:14:31 1999 -+++ work/drivers/atm/Makefile Mon Jan 31 11:38:23 2000 ++++ work/drivers/atm/Makefile Wed Feb 2 20:33:04 2000 @@ -43,12 +43,18 @@ ifeq ($(CONFIG_ATM_NICSTAR_USE_SUNI),y) NEED_SUNI_LX = suni.o @@ -982,7 +996,7 @@ +fore_200e.o: fore200e.o $(FORE200E_FW_OBJS) + $(LD) -r -o $@ $< $(FORE200E_FW_OBJS) --- ref/drivers/atm/ambassador.c Wed Sep 29 23:02:59 1999 -+++ work/drivers/atm/ambassador.c Mon Jan 31 11:38:23 2000 ++++ work/drivers/atm/ambassador.c Wed Feb 2 20:33:04 2000 @@ -1405,7 +1405,7 @@ dont_panic (dev); } else { @@ -1020,7 +1034,7 @@ /********** housekeeping **********/ --- ref/drivers/atm/atmdev_init.c Thu Aug 26 21:42:33 1999 -+++ work/drivers/atm/atmdev_init.c Mon Jan 31 11:38:23 2000 ++++ work/drivers/atm/atmdev_init.c Wed Feb 2 20:33:05 2000 @@ -28,6 +28,12 @@ #ifdef CONFIG_ATM_HORIZON extern int hrz_detect(void); @@ -1048,7 +1062,7 @@ return devs; } --- ref/drivers/atm/atmsar11.data Mon Aug 23 18:56:31 1999 -+++ work/drivers/atm/atmsar11.data Mon Jan 31 11:38:23 2000 ++++ work/drivers/atm/atmsar11.data Wed Feb 2 20:33:05 2000 @@ -2,12 +2,12 @@ Madge Ambassador ATM Adapter microcode. Copyright (C) 1995-1999 Madge Networks Ltd. @@ -1068,7 +1082,7 @@ 0x401a6800, --- ref/drivers/atm/atmsar11.regions Mon Aug 23 18:56:31 1999 -+++ work/drivers/atm/atmsar11.regions Mon Jan 31 11:38:23 2000 ++++ work/drivers/atm/atmsar11.regions Wed Feb 2 20:33:05 2000 @@ -1,3 +1,6 @@ +/* + See copyright and licensing conditions in ambassador.* files. @@ -1077,14 +1091,14 @@ { 0xa0d0d500, 80, }, { 0xa0d0f000, 978, }, --- ref/drivers/atm/atmsar11.start Mon Aug 23 18:56:31 1999 -+++ work/drivers/atm/atmsar11.start Mon Jan 31 11:38:23 2000 ++++ work/drivers/atm/atmsar11.start Wed Feb 2 20:33:05 2000 @@ -1 +1,4 @@ +/* + See copyright and licensing conditions in ambassador.* files. +*/ 0xa0d0f000 --- ref/drivers/atm/atmtcp.c Wed Sep 8 20:14:31 1999 -+++ work/drivers/atm/atmtcp.c Mon Jan 31 11:38:23 2000 ++++ work/drivers/atm/atmtcp.c Wed Feb 2 20:33:05 2000 @@ -1,6 +1,6 @@ /* drivers/atm/atmtcp.c - ATM over TCP "device" driver */ @@ -1203,7 +1217,7 @@ --- ref/drivers/atm/eni.c Wed Sep 8 20:14:31 1999 -+++ work/drivers/atm/eni.c Mon Jan 31 11:38:23 2000 ++++ work/drivers/atm/eni.c Wed Feb 2 20:33:05 2000 @@ -1,6 +1,6 @@ /* drivers/atm/eni.c - Efficient Networks ENI155P device driver */ @@ -1464,7 +1478,7 @@ --- ref/drivers/atm/eni.h Mon Aug 23 18:56:31 1999 -+++ work/drivers/atm/eni.h Mon Jan 31 11:46:05 2000 ++++ work/drivers/atm/eni.h Wed Feb 2 20:40:44 2000 @@ -1,6 +1,6 @@ /* drivers/atm/eni.h - Efficient Networks ENI155P device driver declarations */ @@ -1526,7 +1540,7 @@ }; --- /dev/null Tue May 5 22:32:27 1998 -+++ work/drivers/atm/fore200e.c Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/fore200e.c Wed Feb 2 20:33:05 2000 @@ -0,0 +1,2958 @@ +/* + $Id: $ @@ -4487,7 +4501,7 @@ + {} +}; --- /dev/null Tue May 5 22:32:27 1998 -+++ work/drivers/atm/fore200e.h Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/fore200e.h Wed Feb 2 20:33:05 2000 @@ -0,0 +1,945 @@ +#ifndef _FORE200E_H +#define _FORE200E_H @@ -5435,7 +5449,7 @@ +#endif /* __KERNEL__ */ +#endif /* _FORE200E_H */ --- /dev/null Tue May 5 22:32:27 1998 -+++ work/drivers/atm/fore200e_mkfirm.c Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/fore200e_mkfirm.c Wed Feb 2 20:33:05 2000 @@ -0,0 +1,155 @@ +/* + $Id: $ @@ -5593,7 +5607,7 @@ + exit(0); +} --- ref/drivers/atm/horizon.c Wed Sep 8 20:14:31 1999 -+++ work/drivers/atm/horizon.c Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/horizon.c Wed Feb 2 20:33:05 2000 @@ -2623,12 +2623,10 @@ switch (level) { case SOL_SOCKET: @@ -5656,7 +5670,7 @@ static int __init hrz_probe (void) { --- /dev/null Tue May 5 22:32:27 1998 -+++ work/drivers/atm/idt77105.c Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/idt77105.c Wed Feb 2 20:33:05 2000 @@ -0,0 +1,385 @@ +/* drivers/atm/idt77105.c - IDT77105 (PHY) driver */ + @@ -6044,7 +6058,7 @@ + +#endif --- /dev/null Tue May 5 22:32:27 1998 -+++ work/drivers/atm/idt77105.h Mon Jan 31 11:46:16 2000 ++++ work/drivers/atm/idt77105.h Wed Feb 2 20:40:54 2000 @@ -0,0 +1,92 @@ +/* drivers/atm/idt77105.h - IDT77105 (PHY) declarations */ + @@ -6139,7 +6153,7 @@ + +#endif --- /dev/null Tue May 5 22:32:27 1998 -+++ work/drivers/atm/iphase.c Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/iphase.c Wed Feb 2 20:33:05 2000 @@ -0,0 +1,3315 @@ +/****************************************************************************** + iphase.c: Device driver for Interphase ATM PCI adapter cards @@ -9457,7 +9471,7 @@ +#endif + --- /dev/null Tue May 5 22:32:27 1998 -+++ work/drivers/atm/iphase.h Mon Jan 31 11:46:43 2000 ++++ work/drivers/atm/iphase.h Wed Feb 2 20:41:20 2000 @@ -0,0 +1,1465 @@ +/****************************************************************************** + Device driver for Interphase ATM PCI adapter cards @@ -10925,7 +10939,7 @@ + +#endif /* IPHASE_H */ --- ref/drivers/atm/nicstar.c Mon Jan 10 23:05:32 2000 -+++ work/drivers/atm/nicstar.c Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/nicstar.c Wed Feb 2 20:33:05 2000 @@ -44,6 +44,9 @@ #ifdef CONFIG_ATM_NICSTAR_USE_SUNI #include "suni.h" @@ -11112,7 +11126,7 @@ } } --- ref/drivers/atm/nicstar.h Mon Aug 23 18:56:31 1999 -+++ work/drivers/atm/nicstar.h Mon Jan 31 11:46:16 2000 ++++ work/drivers/atm/nicstar.h Wed Feb 2 20:40:54 2000 @@ -51,7 +51,7 @@ 128K x 32bit SRAM will limit the maximum VCI. */ @@ -11328,7 +11342,7 @@ int rct_size; /* Number of entries */ int vpibits; --- /dev/null Tue May 5 22:32:27 1998 -+++ work/drivers/atm/pca200e.data Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/pca200e.data Wed Feb 2 20:33:05 2000 @@ -0,0 +1,850 @@ +:150000001F8B0808AB5A10380203706361323030652E62696E4D +:150015007D00E43A0D7014D7796FA5BDE84EC86211A7333020EE @@ -12181,7 +12195,7 @@ +:06459000C0E6B892000035 +:00000001FF --- /dev/null Tue May 5 22:32:27 1998 -+++ work/drivers/atm/pca200e_ecd.data Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/pca200e_ecd.data Wed Feb 2 20:33:05 2000 @@ -0,0 +1,906 @@ +:150000001F8B0808AC5A10380203706361323030655F65636428 +:150015002E62696E327D00DC3A0D7054459AFD261333136278A4 @@ -13090,7 +13104,7 @@ +:104A2800FEFE99F5D6F2FF06E2E5D1A4A89C0000A7 +:00000001FF --- /dev/null Tue May 5 22:32:27 1998 -+++ work/drivers/atm/sba200e_ecd.data Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/sba200e_ecd.data Wed Feb 2 20:33:05 2000 @@ -0,0 +1,928 @@ +:150000001F8B0808AC5A10380203736261323030655F65636426 +:150015002E62696E327D00DC3A0D6C14D7996FD7B3F5AE71CCD4 @@ -14021,7 +14035,7 @@ +:014BF60000BE +:00000001FF --- ref/drivers/atm/suni.c Wed Sep 8 20:14:32 1999 -+++ work/drivers/atm/suni.c Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/suni.c Wed Feb 2 20:33:05 2000 @@ -1,6 +1,6 @@ /* drivers/atm/suni.c - PMC SUNI (PHY) driver */ @@ -14065,7 +14079,7 @@ } --- ref/drivers/atm/uPD98402.c Thu Aug 26 21:42:33 1999 -+++ work/drivers/atm/uPD98402.c Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/uPD98402.c Wed Feb 2 20:33:05 2000 @@ -1,6 +1,6 @@ /* drivers/atm/uPD98402.c - NEC uPD98402 (PHY) declarations */ @@ -14084,7 +14098,7 @@ } --- ref/drivers/atm/zatm.c Wed Sep 8 20:14:32 1999 -+++ work/drivers/atm/zatm.c Mon Jan 31 11:38:24 2000 ++++ work/drivers/atm/zatm.c Wed Feb 2 20:33:05 2000 @@ -1,6 +1,6 @@ /* drivers/atm/zatm.c - ZeitNet ZN122x device driver */ @@ -14167,8 +14181,8 @@ }; ---- ref/include/linux/atm.h Fri Jan 28 17:03:35 2000 -+++ work/include/linux/atm.h Mon Jan 31 11:46:01 2000 +--- ref/include/linux/atm.h Tue Feb 1 02:14:10 2000 ++++ work/include/linux/atm.h Wed Feb 2 20:40:40 2000 @@ -1,6 +1,6 @@ /* atm.h - general ATM declarations */ @@ -14270,7 +14284,7 @@ #ifdef __KERNEL__ --- ref/include/linux/atm_eni.h Mon Aug 23 18:56:31 1999 -+++ work/include/linux/atm_eni.h Mon Jan 31 11:38:25 2000 ++++ work/include/linux/atm_eni.h Wed Feb 2 20:33:05 2000 @@ -1,7 +1,7 @@ /* atm_eni.h - Driver-specific declarations of the ENI driver (for use by driver-specific utilities) */ @@ -14292,12 +14306,12 @@ + #define ENI_MEMDUMP _IOW('a',ATMIOC_SARPRV,struct atmif_sioc) /* printk memory map */ -+#define ENI_SETMULT _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc) ++#define ENI_SETMULT _IOW('a',ATMIOC_SARPRV+7,struct atmif_sioc) + /* set buffer multipliers */ #endif --- /dev/null Tue May 5 22:32:27 1998 -+++ work/include/linux/atm_idt77105.h Mon Jan 31 11:38:25 2000 ++++ work/include/linux/atm_idt77105.h Wed Feb 2 20:33:05 2000 @@ -0,0 +1,40 @@ +/* atm_idt77105.h - Driver-specific declarations of the IDT77105 driver (for + * use by driver-specific utilities) */ @@ -14340,7 +14354,7 @@ + +#endif --- ref/include/linux/atm_nicstar.h Mon Aug 23 18:56:31 1999 -+++ work/include/linux/atm_nicstar.h Mon Jan 31 11:38:25 2000 ++++ work/include/linux/atm_nicstar.h Wed Feb 2 20:33:05 2000 @@ -18,6 +18,7 @@ * sys/types.h for struct timeval */ @@ -14359,7 +14373,7 @@ typedef struct pool_levels --- ref/include/linux/atm_tcp.h Wed Sep 8 20:14:32 1999 -+++ work/include/linux/atm_tcp.h Mon Jan 31 11:46:33 2000 ++++ work/include/linux/atm_tcp.h Wed Feb 2 20:41:09 2000 @@ -1,12 +1,14 @@ /* atm_tcp.h - Driver-specific declarations of the ATMTCP driver (for use by driver-specific utilities) */ @@ -14393,7 +14407,7 @@ /* * Field usage: --- ref/include/linux/atm_zatm.h Mon Aug 23 18:56:31 1999 -+++ work/include/linux/atm_zatm.h Mon Jan 31 11:38:25 2000 ++++ work/include/linux/atm_zatm.h Wed Feb 2 20:33:05 2000 @@ -1,7 +1,7 @@ /* atm_zatm.h - Driver-specific declarations of the ZATM driver (for use by driver-specific utilities) */ @@ -14412,7 +14426,7 @@ #define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc) --- /dev/null Tue May 5 22:32:27 1998 -+++ work/include/linux/atmapi.h Mon Jan 31 11:38:25 2000 ++++ work/include/linux/atmapi.h Wed Feb 2 20:33:05 2000 @@ -0,0 +1,29 @@ +/* atmapi.h - ATM API user space/kernel compatibility */ + @@ -14443,8 +14457,8 @@ +typedef struct { unsigned char _[8]; } atm_kptr_t; + +#endif ---- ref/include/linux/atmarp.h Fri Jan 28 17:03:35 2000 -+++ work/include/linux/atmarp.h Mon Jan 31 11:51:38 2000 +--- ref/include/linux/atmarp.h Tue Feb 1 02:14:11 2000 ++++ work/include/linux/atmarp.h Wed Feb 2 20:46:30 2000 @@ -1,6 +1,6 @@ /* atmarp.h - ATM ARP protocol and kernel-demon interface definitions */ @@ -14461,8 +14475,8 @@ #include ---- ref/include/linux/atmdev.h Fri Jan 28 17:04:09 2000 -+++ work/include/linux/atmdev.h Mon Jan 31 11:46:01 2000 +--- ref/include/linux/atmdev.h Tue Feb 1 02:14:43 2000 ++++ work/include/linux/atmdev.h Wed Feb 2 20:40:40 2000 @@ -8,6 +8,8 @@ @@ -14571,7 +14585,7 @@ --- ref/include/linux/atmioc.h Mon Aug 23 18:56:31 1999 -+++ work/include/linux/atmioc.h Mon Jan 31 11:38:25 2000 ++++ work/include/linux/atmioc.h Wed Feb 2 20:33:05 2000 @@ -1,10 +1,10 @@ /* atmioc.h - ranges for ATM-related ioctl numbers */ @@ -14586,7 +14600,7 @@ */ --- ref/include/linux/atmlec.h Mon Aug 23 18:56:31 1999 -+++ work/include/linux/atmlec.h Mon Jan 31 11:52:37 2000 ++++ work/include/linux/atmlec.h Wed Feb 2 20:47:25 2000 @@ -9,6 +9,7 @@ #ifndef _ATMLEC_H_ #define _ATMLEC_H_ @@ -14641,7 +14655,7 @@ struct atmlec_ioc { int dev_num; --- ref/include/linux/atmmpc.h Mon Aug 23 18:56:31 1999 -+++ work/include/linux/atmmpc.h Mon Jan 31 11:52:37 2000 ++++ work/include/linux/atmmpc.h Wed Feb 2 20:47:25 2000 @@ -1,6 +1,7 @@ #ifndef _ATMMPC_H_ #define _ATMMPC_H_ @@ -14689,7 +14703,7 @@ #endif /* _ATMMPC_H_ */ - --- ref/include/linux/atmsap.h Mon Aug 23 18:56:32 1999 -+++ work/include/linux/atmsap.h Mon Jan 31 11:38:25 2000 ++++ work/include/linux/atmsap.h Wed Feb 2 20:33:05 2000 @@ -1,11 +1,13 @@ /* atmsap.h - ATM Service Access Point addressing definitions */ @@ -14747,7 +14761,7 @@ --- ref/include/linux/atmsvc.h Mon Aug 23 18:56:32 1999 -+++ work/include/linux/atmsvc.h Mon Jan 31 11:52:37 2000 ++++ work/include/linux/atmsvc.h Wed Feb 2 20:47:25 2000 @@ -1,11 +1,12 @@ /* atmsvc.h - ATM signaling kernel-demon interface definitions */ @@ -14790,7 +14804,7 @@ /* --- ref/include/linux/sonet.h Mon Aug 23 18:56:32 1999 -+++ work/include/linux/sonet.h Mon Jan 31 11:38:25 2000 ++++ work/include/linux/sonet.h Wed Feb 2 20:33:05 2000 @@ -1,22 +1,22 @@ /* sonet.h - SONET/SHD physical layer control */ @@ -14825,8 +14839,8 @@ #define SONET_GETSTAT _IOR('a',ATMIOC_PHYTYP,struct sonet_stats) /* get statistics */ ---- ref/include/net/atmclip.h Fri Jan 28 17:04:09 2000 -+++ work/include/net/atmclip.h Mon Jan 31 11:51:38 2000 +--- ref/include/net/atmclip.h Tue Feb 1 02:14:43 2000 ++++ work/include/net/atmclip.h Wed Feb 2 20:46:30 2000 @@ -1,6 +1,6 @@ /* net/atm/atmarp.h - RFC1577 ATM ARP */ @@ -14847,7 +14861,15 @@ }; --- ref/net/sched/sch_atm.c Wed Sep 8 20:14:32 1999 -+++ work/net/sched/sch_atm.c Mon Jan 31 11:38:26 2000 ++++ work/net/sched/sch_atm.c Wed Feb 2 20:33:05 2000 +@@ -1,6 +1,6 @@ + /* net/sched/sch_atm.c - ATM VC selection "queueing discipline" */ + +-/* Written 1998,1999 by Werner Almesberger, EPFL ICA */ ++/* Written 1998-2000 by Werner Almesberger, EPFL ICA */ + + + #include @@ -56,12 +56,14 @@ @@ -14863,6 +14885,15 @@ struct socket *sock; /* for closing */ u32 classid; /* x:y type ID */ int ref; /* reference count */ +@@ -133,7 +135,7 @@ + + static unsigned long atm_tc_get(struct Qdisc *sch,u32 classid) + { +- struct atm_qdisc_data *p = PRIV(sch); ++ struct atm_qdisc_data *p __attribute__((unused)) = PRIV(sch); + struct atm_flow_data *flow; + + DPRINTK("atm_tc_get(sch %p,[qdisc %p],classid %x)\n",sch,p,classid); @@ -184,6 +186,7 @@ } if (flow->sock) { @@ -14940,7 +14971,7 @@ atm_tc_init, /* init */ --- ref/net/atm/atm_misc.c Wed Sep 8 20:14:32 1999 -+++ work/net/atm/atm_misc.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/atm_misc.c Wed Feb 2 20:33:05 2000 @@ -10,13 +10,11 @@ #include #include @@ -14966,7 +14997,7 @@ if (skb) { --- ref/net/atm/clip.c Wed Sep 8 20:14:32 1999 -+++ work/net/atm/clip.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/clip.c Wed Feb 2 20:33:05 2000 @@ -1,6 +1,6 @@ /* net/atm/clip.c - RFC1577 Classical IP over ATM */ @@ -15092,7 +15123,7 @@ --- ref/net/atm/common.c Wed Sep 8 20:14:32 1999 -+++ work/net/atm/common.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/common.c Wed Feb 2 20:33:05 2000 @@ -1,6 +1,6 @@ /* net/atm/common.c - ATM sockets (common part for PVC and SVC) */ @@ -15334,7 +15365,7 @@ if (!(vcc->flags & ATM_VF_HASQOS)) return -EINVAL; return copy_to_user(optval,&vcc->qos,sizeof(vcc->qos)) ? --- ref/net/atm/lec.c Wed Sep 8 20:14:32 1999 -+++ work/net/atm/lec.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/lec.c Wed Feb 2 20:33:05 2000 @@ -39,7 +39,6 @@ #include "lec.h" @@ -15569,7 +15600,7 @@ kfree(to_remove); } --- ref/net/atm/mpc.c Mon Aug 23 18:56:32 1999 -+++ work/net/atm/mpc.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/mpc.c Wed Feb 2 20:33:05 2000 @@ -27,7 +27,6 @@ #include "lec.h" @@ -15631,7 +15662,7 @@ eg_cache_entry *eg_entry = client->eg_ops->search_by_src_ip(dst_ip, client); if(eg_entry && eg_entry->shortcut){ --- ref/net/atm/mpoa_caches.c Mon Aug 23 18:56:32 1999 -+++ work/net/atm/mpoa_caches.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/mpoa_caches.c Wed Feb 2 20:33:05 2000 @@ -87,7 +87,7 @@ struct mpoa_client *client) { @@ -15652,7 +15683,7 @@ dprintk("mpoa: (%s) mpoa_caches.c: threshold exceeded for ip %u.%u.%u.%u, sending MPOA res req\n", mpc->dev->name, ip[0], ip[1], ip[2], ip[3]); entry->entry_state = INGRESS_RESOLVING; --- ref/net/atm/mpoa_proc.c Fri Nov 19 05:02:02 1999 -+++ work/net/atm/mpoa_proc.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/mpoa_proc.c Wed Feb 2 20:33:05 2000 @@ -143,7 +143,7 @@ while(eg_entry != NULL){ for(i=0;ilatest_ip_addr; --- ref/net/atm/proc.c Sun Nov 28 00:27:49 1999 -+++ work/net/atm/proc.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/proc.c Wed Feb 2 20:33:05 2000 @@ -1,6 +1,6 @@ /* net/atm/proc.c - ATM /proc interface */ @@ -15895,7 +15926,7 @@ return -ENOMEM; } --- ref/net/atm/raw.c Wed Sep 8 20:14:32 1999 -+++ work/net/atm/raw.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/raw.c Wed Feb 2 20:33:05 2000 @@ -11,14 +11,8 @@ #include #include @@ -15923,7 +15954,7 @@ atomic_sub(skb->truesize+ATM_PDU_OVHD,&vcc->tx_inuse); dev_kfree_skb(skb); --- ref/net/atm/resources.c Mon Aug 23 18:56:32 1999 -+++ work/net/atm/resources.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/resources.c Wed Feb 2 20:33:05 2000 @@ -145,8 +145,10 @@ sk_free(sk); return NULL; @@ -15936,7 +15967,7 @@ vcc->prev = NULL; vcc->next = nodev_vccs; --- ref/net/atm/signaling.c Mon Aug 23 18:56:32 1999 -+++ work/net/atm/signaling.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/signaling.c Wed Feb 2 20:33:05 2000 @@ -1,6 +1,6 @@ /* net/atm/signaling.c - ATM signaling */ @@ -16020,7 +16051,7 @@ --- ref/net/atm/signaling.h Mon Aug 23 18:56:32 1999 -+++ work/net/atm/signaling.h Mon Jan 31 11:52:37 2000 ++++ work/net/atm/signaling.h Wed Feb 2 20:47:25 2000 @@ -1,6 +1,6 @@ /* net/atm/signaling.h - ATM signaling */ @@ -16039,7 +16070,7 @@ int sigd_attach(struct atm_vcc *vcc); void signaling_init(void); --- ref/net/atm/svc.c Wed Sep 8 20:14:32 1999 -+++ work/net/atm/svc.c Mon Jan 31 11:38:26 2000 ++++ work/net/atm/svc.c Wed Feb 2 20:33:05 2000 @@ -1,6 +1,6 @@ /* net/atm/svc.c - ATM SVC sockets */ @@ -16057,7 +16088,7 @@ error = atm_connect(newsock,msg->pvc.sap_addr.itf, msg->pvc.sap_addr.vpi,msg->pvc.sap_addr.vci); --- ref/net/atm/tunable.h Wed Sep 8 20:14:32 1999 -+++ work/net/atm/tunable.h Mon Jan 31 11:38:26 2000 ++++ work/net/atm/tunable.h Wed Feb 2 20:33:05 2000 @@ -1,16 +0,0 @@ -/* net/atm/tunable.h - Tunable parameters of ATM support */ - diff -ur --new-file old/atm/doc/usage.tex new/atm/doc/usage.tex --- old/atm/doc/usage.tex Mon Jan 31 14:55:14 2000 +++ new/atm/doc/usage.tex Wed Feb 2 20:55:46 2000 @@ -1,7 +1,7 @@ %%def%:= %:\begin{verbatim} -%:Usage instructions - ATM on Linux, release 0.66 +%:Usage instructions - ATM on Linux, release 0.67 %:------------------------------------------------- %: %:\end{verbatim} @@ -38,14 +38,14 @@ \title{ATM on Linux \\ User's guide \\ - Release 0.66 (beta)} + Release 0.67 (beta)} \author{Werner Almesberger \\ {\tt Werner.Almesberger@epfl.ch} \\ \\ Institute for computer Communications and Applications (ICA) \\ EPFL, CH-1015 Lausanne, Switzerland} -\date{January 31, 2000} +\date{February 2, 2000} \begin{document} \maketitle @@ -82,9 +82,9 @@ In order to install this package, you need \begin{itemize} \item the package itself - \url{ftp://icaftp.epfl.ch/pub/linux/atm/dist/atm-0.66.tar.gz} - \item the Linux kernel, version 2.3.41, e.g. from - \url{ftp://ftp.kernel.org/pub/linux/kernel/v2.3/linux-2.3.41.tar.gz} + \url{ftp://icaftp.epfl.ch/pub/linux/atm/dist/atm-0.67.tar.gz} + \item the Linux kernel, version 2.3.42, e.g. from + \url{ftp://ftp.kernel.org/pub/linux/kernel/v2.3/linux-2.3.42.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.66.tar.gz +tar xfz atm-0.67.tar.gz \end{verbatim} and the kernel source: \begin{verbatim} -tar xfz linux-2.3.41.tar.gz +tar xfz linux-2.3.42.tar.gz \end{verbatim} Finally, you can extract the ATM-related patches: @@ -127,7 +127,7 @@ \item[\path{atm/ilmid/}] ILMI address registration demon: \name{ilmid} \item[\path{atm/maint/}] ATM maintenance programs: \name{atmaddr}, \name{atmdiag}, \name{atmdump}, \name{atmtcp}, \name{enitune}, \name{esi}, - \name{sonetdiag}, \name{saaldump}, and \name{zntune} + \name{sonetdiag}, \name{saaldump}, \name{sunimode}, and \name{zntune} \item[\path{atm/test/}] Test programs: \name{align}, \name{aping}, \name{aread}, \name{awrite}, \name{br}, \name{bw}, \name{isp}, \name{ttcp\_atm}, \name{window} @@ -165,7 +165,7 @@ Classical IP over ATM (CONFIG_ATM_CLIP) Do NOT send ICMP if no neighbour (CONFIG_ATM_CLIP_NO_ICMP) LAN Emulation (LANE) support (CONFIG_ATM_LANE) - Multi-Protocol Over ATM (MPOA) support (CONFIG_ATM_MPOA) + Multi-Protocol Over ATM (MPOA) support (CONFIG_ATM_MPOA) ATM over TCP (CONFIG_ATM_TCP) Efficient Networks ENI155P (CONFIG_ATM_ENI) Enable extended debugging (CONFIG_ATM_ENI_DEBUG) @@ -182,6 +182,14 @@ Enable extended debugging (CONFIG_ATM_ZATM_DEBUG) Enable usec resolution timestamps (CONFIG_ATM_ZATM_EXACT_TS) IDT 77201 (NICStAR) (CONFIG_ATM_NICSTAR) + Use suni PHY driver (155Mbps) (CONFIG_ATM_NICSTAR_USE_SUNI) + Use IDT77015 PHY driver (25Mbps) (CONFIG_ATM_NICSTAR_USE_IDT77105) +Madge Ambassador (Collage PCI 155 Server) (CONFIG_ATM_AMBASSADOR) + Enable debugging messages (CONFIG_ATM_AMBASSADOR_DEBUG) +Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client) + Enable debugging messages (CONFIG_ATM_HORIZON_DEBUG) +Interphase ATM PCI x575/x525/x531 (CONFIG_ATM_IA) + Enable debugging messages (CONFIG_ATM_IA_DEBUG) \end{verbatim} %after ATM % Enable single-copy (CONFIG_MMU_HACKS) diff -ur --new-file old/atm/doc/usage.txt new/atm/doc/usage.txt --- old/atm/doc/usage.txt Mon Jan 31 14:57:14 2000 +++ new/atm/doc/usage.txt Wed Feb 2 22:53:12 2000 @@ -1,4 +1,4 @@ -Usage instructions - ATM on Linux, release 0.66 +Usage instructions - ATM on Linux, release 0.67 ------------------------------------------------- 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://icaftp.epfl.ch/pub/linux/atm/dist/atm-0.66.tar.gz - - the Linux kernel, version 2.3.41, e.g. from - ftp://ftp.kernel.org/pub/linux/kernel/v2.3/linux-2.3.41.tar.gz + ftp://icaftp.epfl.ch/pub/linux/atm/dist/atm-0.67.tar.gz + - the Linux kernel, version 2.3.42, e.g. from + ftp://ftp.kernel.org/pub/linux/kernel/v2.3/linux-2.3.42.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.66.tar.gz +tar xfz atm-0.67.tar.gz and the kernel source: -tar xfz linux-2.3.41.tar.gz +tar xfz linux-2.3.42.tar.gz Finally, you can extract the ATM-related patches: @@ -53,7 +53,7 @@ atm/qgen/ Q.2931-style message handling atm/ilmid/ ILMI address registration demon: ilmid atm/maint/ ATM maintenance programs: atmaddr, atmdiag, atmdump, atmtcp, - enitune, esi, sonetdiag, saaldump, and zntune + enitune, esi, sonetdiag, saaldump, sunimode, and zntune atm/test/ Test programs: align, aping, aread, awrite, br, bw, isp, ttcp_atm, window atm/arpd/ ATMARP tools and demon: atmarp, atmarpd @@ -86,7 +86,7 @@ Classical IP over ATM (CONFIG_ATM_CLIP) Do NOT send ICMP if no neighbour (CONFIG_ATM_CLIP_NO_ICMP) LAN Emulation (LANE) support (CONFIG_ATM_LANE) - Multi-Protocol Over ATM (MPOA) support (CONFIG_ATM_MPOA) + Multi-Protocol Over ATM (MPOA) support (CONFIG_ATM_MPOA) ATM over TCP (CONFIG_ATM_TCP) Efficient Networks ENI155P (CONFIG_ATM_ENI) Enable extended debugging (CONFIG_ATM_ENI_DEBUG) @@ -103,6 +103,14 @@ Enable extended debugging (CONFIG_ATM_ZATM_DEBUG) Enable usec resolution timestamps (CONFIG_ATM_ZATM_EXACT_TS) IDT 77201 (NICStAR) (CONFIG_ATM_NICSTAR) + Use suni PHY driver (155Mbps) (CONFIG_ATM_NICSTAR_USE_SUNI) + Use IDT77015 PHY driver (25Mbps) (CONFIG_ATM_NICSTAR_USE_IDT77105) +Madge Ambassador (Collage PCI 155 Server) (CONFIG_ATM_AMBASSADOR) + Enable debugging messages (CONFIG_ATM_AMBASSADOR_DEBUG) +Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client) + Enable debugging messages (CONFIG_ATM_HORIZON_DEBUG) +Interphase ATM PCI x575/x525/x531 (CONFIG_ATM_IA) + Enable debugging messages (CONFIG_ATM_IA_DEBUG) The burst settings of the ENI driver can be fine-tuned. This may be necessary if the default settings lead to buffer overruns in the PCI diff -ur --new-file old/atm/maint/Makefile new/atm/maint/Makefile --- old/atm/maint/Makefile Fri Jan 21 09:23:21 2000 +++ new/atm/maint/Makefile Tue Feb 1 21:30:55 2000 @@ -2,7 +2,7 @@ INCLUDES=-I../qgen -I../saal BOOTPGMS=atmaddr esi SYSPGMS=atmtcp enitune zntune loop25 # nstune -USRPGMS=atmdiag atmdump sonetdiag saaldump +USRPGMS=atmdiag atmdump sonetdiag saaldump sunimode MAN8=atmaddr.8 atmdiag.8 atmdump.8 atmtcp.8 include ../Rules.make diff -ur --new-file old/atm/maint/sunimode.c new/atm/maint/sunimode.c --- old/atm/maint/sunimode.c Thu Jan 1 01:00:00 1970 +++ new/atm/maint/sunimode.c Sat Jan 22 16:29:25 2000 @@ -0,0 +1,112 @@ +/* + $Id: $ + + sunimode.c - get/set S/UNI loopback mode + + Christophe Lizzi (lizzi@cnam.fr), December 1999. + + This software may be used and distributed according to the terms + of the GNU General Public License, incorporated herein by reference. +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +static const char* suni_mode[] = { + "normal operation", + "diagnostic loopback", + "line loopback" +}; + +char* progname; + +void usage(void) +{ + fprintf(stderr, "%s [{-n, -d, -l}] [itf]\n" + "\t-n: normal operation\n" + "\t-d: diagnostic loopback (tx -> rx)\n" + "\t-l: line loopback (rx -> tx)\n", progname); + exit(-1); +} + + +int main(int argc, char** argv) +{ + int sock, normal_op, diag_loop, line_loop, loop_mode, itf; + struct atmif_sioc req; + + normal_op = diag_loop = line_loop = itf = 0; + + progname = *(argv++); + + while (argc > 1) { + if ((*argv)[0] == '-') { + switch ((*argv)[1]) { + case 'n': + normal_op = 1; + loop_mode = SUNI_LM_NONE; + break; + case 'd': + diag_loop = 1; + loop_mode = SUNI_LM_DIAG; + break; + case 'l': + line_loop = 1; + loop_mode = SUNI_LM_LOOP; + break; + default: + usage(); + } + } + else { + itf = atoi(*argv); + if (itf < 0) + usage(); + } + argc--; + argv++; + } + + if ((sock = socket(PF_ATMPVC, SOCK_DGRAM, 0)) < 0) { + perror("socket"); + exit(-1); + } + + switch(normal_op + diag_loop + line_loop) { + + case 0: /* get the current loopback mode */ + req.number = itf; + req.length = sizeof(loop_mode); + req.arg = (void*) &loop_mode; + + if (ioctl(sock, SUNI_GETLOOP, &req) < 0) + perror("ioctl SUNI_GETLOOP"); + else + printf("itf %d: %s\n", itf, suni_mode[ loop_mode ]); + + exit(loop_mode); + + case 1: /* set a new loopback mode */ + req.number = itf; + req.length = 0; + req.arg = (void*) loop_mode; + + if (ioctl(sock, SUNI_SETLOOP, &req) < 0) + perror("ioctl SUNI_SETLOOP"); + + exit(0); + + default: /* more than one mode was supplied */ + usage(); + } + + return 0; +} diff -ur --new-file old/atm/mkdist new/atm/mkdist --- old/atm/mkdist Fri Jan 28 12:45:41 2000 +++ new/atm/mkdist Tue Feb 1 21:31:16 2000 @@ -73,7 +73,7 @@ atm/maint/sonetdiag.c atm/maint/loop25.c \ atm/maint/atmaddr.8 atm/maint/atmdiag.8 atm/maint/atmdump.8 \ atm/maint/atmtcp.8 atm/maint/zntune.c atm/maint/enitune.c atm/maint/esi.c \ - atm/maint/esi.8 \ + atm/maint/esi.8 atm/maint/sunimode.c \ atm/maint/saaldump.c atm/maint/README.nstune atm/maint/nstune.c \ atm/test/Makefile atm/test/aread.c atm/test/awrite.c atm/test/br.c \ atm/test/bw.c atm/test/ttcp.c atm/test/aping.c atm/test/window.c \ .