CVS: linux-atm/src/switch .cvsignore,1.1,1.2 cfg_y.y,1.2,1.3

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

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

Modified Files:
	cfg_y.y 
Added Files:
	.cvsignore 
Log Message:
merge 2.5.0 branch into the head



Index: cfg_y.y
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/switch/cfg_y.y,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cfg_y.y	9 Oct 2001 22:33:08 -0000	1.2
--- cfg_y.y	1 Jan 2008 00:14:52 -0000	1.3
***************
*** 119,123 ****
  	      T2A_SVC | T2A_WILDCARD | T2A_NAME | T2A_LOCAL) < 0) {
  		yyerror("invalid address");
! 		return;
  	    }
  	    put_route(&addr,mask ? strtol(mask,NULL,10) : INT_MAX,sig);
--- 119,123 ----
  	      T2A_SVC | T2A_WILDCARD | T2A_NAME | T2A_LOCAL) < 0) {
  		yyerror("invalid address");
! 		YYABORT;
  	    }
  	    put_route(&addr,mask ? strtol(mask,NULL,10) : INT_MAX,sig);