CVS: linux-atm/src/arpd .cvsignore, 1.1, 1.2 arp.c, 1.2, 1.3 io.c, 1.2, 1.3 itf.c, 1.2, 1.3

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

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

Modified Files:
	arp.c io.c itf.c 
Added Files:
	.cvsignore 
Log Message:
merge 2.5.0 branch into the head



Index: arp.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/arpd/arp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** arp.c	9 Oct 2001 22:33:06 -0000	1.2
--- arp.c	1 Jan 2008 00:14:49 -0000	1.3
***************
*** 17,20 ****
--- 17,21 ----
  #include <netinet/in.h> /* for ntohs, etc. */
  #define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */
+ #include <linux/types.h>
  #include <linux/if_arp.h>
  #include <linux/if_ether.h>

Index: io.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/arpd/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:06 -0000	1.2
--- io.c	1 Jan 2008 00:14:49 -0000	1.3
***************
*** 23,26 ****
--- 23,27 ----
  #include <linux/atmarp.h>
  #define _LINUX_NETDEVICE_H /* glibc2 */
+ #include <linux/types.h>
  #include <linux/if_arp.h>
  

Index: itf.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/arpd/itf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** itf.c	9 Oct 2001 22:33:06 -0000	1.2
--- itf.c	1 Jan 2008 00:14:49 -0000	1.3
***************
*** 14,17 ****
--- 14,18 ----
  #include <sys/socket.h>
  #define _LINUX_NETDEVICE_H /* glibc2 */
+ #include <linux/types.h>
  #include <linux/if_arp.h>