Update of /cvsroot/linux-atm/linux-atm/src/maint
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942/src/maint
Modified Files:
Makefile.am atmtcp.c enitune.c
Added Files:
.cvsignore hediag.c
Log Message:
merge 2.5.0 branch into the head
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/maint/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am 9 Oct 2001 22:33:07 -0000 1.2
--- Makefile.am 1 Jan 2008 00:14:51 -0000 1.3
***************
*** 1,7 ****
BOOTPGMS=atmaddr esi
! SYSPGMS=atmloop atmtcp enitune zntune # nstune
USRPGMS=atmdiag atmdump sonetdiag saaldump
! INCLUDES=-I$(top_builddir)/src/qgen -I$(top_builddir)/src/saal -I.
LDADD = $(top_builddir)/src/lib/libatm.la
--- 1,7 ----
BOOTPGMS=atmaddr esi
! SYSPGMS=atmloop atmtcp enitune zntune hediag # nstune
USRPGMS=atmdiag atmdump sonetdiag saaldump
! INCLUDES=-I$(srcdir)/../qgen -I$(srcdir)/../saal -I.
LDADD = $(top_builddir)/src/lib/libatm.la
Index: atmtcp.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/maint/atmtcp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** atmtcp.c 9 Oct 2001 22:33:07 -0000 1.2
--- atmtcp.c 1 Jan 2008 00:14:51 -0000 1.3
***************
*** 61,65 ****
static fd_set in_set;
static int fds = 0;
! static int debug = 0;
static int links = 0;
--- 61,65 ----
static fd_set in_set;
static int fds = 0;
! int debug = 0;
static int links = 0;
Index: enitune.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/maint/enitune.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** enitune.c 9 Oct 2001 22:33:07 -0000 1.2
--- enitune.c 1 Jan 2008 00:14:51 -0000 1.3
***************
*** 44,48 ****
if (*end || mult.rx <= 100) usage(name);
break;
- default:
}
if (argc != optind+1) usage(name);
--- 44,47 ----
|
