CVS: linux-atm/src/mpoad .cvsignore, 1.1, 1.2 io.c, 1.2, 1.3 k_interf.c, 1.2, 1.3 lecs.c, 1.2, 1.3 main.c, 1.2, 1.3 p_factory.c, 1.2, 1.3 p_recogn.c, 1.2, 1.3

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

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

Modified Files:
	io.c k_interf.c lecs.c main.c p_factory.c p_recogn.c 
Added Files:
	.cvsignore 
Log Message:
merge 2.5.0 branch into the head



Index: io.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/io.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** io.c	9 Oct 2001 22:33:07 -0000	1.2
--- io.c	1 Jan 2008 00:14:51 -0000	1.3
***************
*** 20,23 ****
--- 20,24 ----
  #endif
  #include <atm.h>
+ #include <linux/types.h>
  #include <linux/atmioc.h>
  #include <linux/atmmpc.h>

Index: k_interf.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/k_interf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** k_interf.c	9 Oct 2001 22:33:07 -0000	1.2
--- k_interf.c	1 Jan 2008 00:14:51 -0000	1.3
***************
*** 10,13 ****
--- 10,14 ----
  #include <stdint.h>
  #include <netinet/in.h> /* for ntohl()    */
+ #include <linux/types.h>
  #include <linux/atmmpc.h>
  #include <atm.h>

Index: lecs.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/lecs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lecs.c	9 Oct 2001 22:33:07 -0000	1.2
--- lecs.c	1 Jan 2008 00:14:51 -0000	1.3
***************
*** 12,15 ****
--- 12,16 ----
  #include <atm.h>
  #include <atmsap.h>
+ #include <linux/types.h>
  #include <linux/atmmpc.h>   /* for MPOA Device type TLV */
  #include "lecs.h"

Index: main.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.c	9 Oct 2001 22:33:07 -0000	1.2
--- main.c	1 Jan 2008 00:14:51 -0000	1.3
***************
*** 10,13 ****
--- 10,14 ----
  #include <sys/ioctl.h>
  #include <atm.h>
+ #include <linux/types.h>
  #include <linux/atmdev.h>
  #include <linux/atmmpc.h>

Index: p_factory.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/p_factory.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** p_factory.c	9 Oct 2001 22:33:07 -0000	1.2
--- p_factory.c	1 Jan 2008 00:14:51 -0000	1.3
***************
*** 6,9 ****
--- 6,10 ----
  #include <stdint.h>
  #include <netinet/in.h>
+ #include <linux/types.h>
  #include <linux/atmmpc.h>
  #include <sys/socket.h>
***************
*** 35,39 ****
          while( count > 1 )  {
             /*  This is the inner loop */
!                sum += * ((uint16_t *) addr)++;
                 count -= 2;
         }
--- 36,41 ----
          while( count > 1 )  {
             /*  This is the inner loop */
!                sum += * ((uint16_t *) addr);
!                addr += 2;
                 count -= 2;
         }

Index: p_recogn.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/p_recogn.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** p_recogn.c	9 Oct 2001 22:33:07 -0000	1.2
--- p_recogn.c	1 Jan 2008 00:14:51 -0000	1.3
***************
*** 8,11 ****
--- 8,12 ----
  #include <sys/time.h>
  #include <atm.h>
+ #include <linux/types.h>
  #include <linux/atmmpc.h>
  #include <netinet/in.h>