CVS: linux-atm/src/switch/tcp .cvsignore, 1.1, 1.2 Makefile.am, 1.2, 1.3 tcpsw.c, 1.2, 1.3

[chas w. <ch...@us...>]

Update of /cvsroot/linux-atm/linux-atm/src/switch/tcp
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942/src/switch/tcp

Modified Files:
	Makefile.am tcpsw.c 
Added Files:
	.cvsignore 
Log Message:
merge 2.5.0 branch into the head



Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/switch/tcp/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:08 -0000	1.2
--- Makefile.am	1 Jan 2008 00:14:52 -0000	1.3
***************
*** 1,5 ****
  noinst_PROGRAMS = sw_tcp
  
! INCLUDES = -I$(top_builddir)/src/qgen
  
  sw_tcp_SOURCES = tcpsw.c
--- 1,5 ----
  noinst_PROGRAMS = sw_tcp
  
! INCLUDES = -I$(srcdir)/../../qgen
  
  sw_tcp_SOURCES = tcpsw.c

Index: tcpsw.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/switch/tcp/tcpsw.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcpsw.c	9 Oct 2001 22:33:08 -0000	1.2
--- tcpsw.c	1 Jan 2008 00:14:52 -0000	1.3
***************
*** 346,352 ****
  void fab_init(CALL *call)
  {
!     PRV(call) = alloc_t(FAB);
!     PRV(call)->active = 0;
!     PRV(call)->next = calls;
      calls = call;
  }
--- 346,354 ----
  void fab_init(CALL *call)
  {
!     FAB *fab;
!     call->fab = alloc_t(FAB);
!     fab = PRV(call);
!     fab->active = 0;
!     fab->next = calls;
      calls = call;
  }
***************
*** 363,367 ****
      *walk = PRV(call)->next;
      free(PRV(call));
!     PRV(call) = NULL;
  }
  
--- 365,369 ----
      *walk = PRV(call)->next;
      free(PRV(call));
!     call->fab = NULL;
  }