>Number:         2918
>Category:       kern
>Synopsis:       ATM support in current does not compile and install cleanly
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    kern-bug-people (Kernel Bug People)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Nov  7 04:05:01 1996
>Last-Modified:
>Originator:     Jukka Partanen
>Organization:
	Nokia Research Center
>Release:        1.2B
>Environment:
System: NetBSD tuuletin.research.nokia.com 1.2B NetBSD 1.2B (TUULETIN) #0: Thu Nov 7 13:01:43 EET 1996 partanen@tuuletin.research.nokia.com:/usr/src/current/src/sys/arch/i386/compile/TUULETIN i386


>Description:
	There are some small bugs in the ATM support. Additionally, netnatm
	headers won't be installed by default (maybe this is intentional).
>How-To-Repeat:
	Configure a kernel with ATM support and try to compile it.
>Fix:
--- sys/Makefile.orig	Thu Nov  7 12:44:16 1996
+++ sys/Makefile	Thu Nov  7 12:44:51 1996
@@ -11,7 +11,7 @@
 
 LFILES=	errno.h fcntl.h poll.h syslog.h termios.h
 MFILES=	float.h frame.h stdarg.h varargs.h
-LDIRS=	dev net netinet netccitt netiso netns nfs sys ufs vm 
+LDIRS=	dev net netinet netccitt netiso netns netnatm nfs sys ufs vm 
 
 # Change SYS_INCLUDE in bsd.own.mk or /etc/mk.conf to "symlinks" if you
 # don't want copies
@@ -50,7 +50,7 @@
 	if test ${MACHINE} != ${MACHINE_ARCH} -a \
 	    -d arch/${MACHINE_ARCH}/include; then \
 		${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
-    	    	    ${DESTDIR}/usr/include/${MACHINE_ARCH}; \
+		    ${DESTDIR}/usr/include/${MACHINE_ARCH}; \
 		pax -rw -pa -s "|arch/${MACHINE_ARCH}/include||" \
 		    arch/${MACHINE_ARCH}/include/*.h \
 		    ${DESTDIR}/usr/include/${MACHINE_ARCH}; \
--- sys/netnatm/natm.c.orig	Mon Oct 14 19:47:39 1996
+++ sys/netnatm/natm.c	Thu Nov  7 12:33:17 1996
@@ -361,7 +361,7 @@
 
 #ifdef DIAGNOSTIC
   if ((m->m_flags & M_PKTHDR) == 0)
-    panic("ipintr no HDR");
+    panic("natmintr no HDR");
 #endif
 
   npcb = (struct natmpcb *) m->m_pkthdr.rcvif; /* XXX: overloaded */
--- sys/netnatm/natm_pcb.c.orig	Mon Oct 14 19:47:40 1996
+++ sys/netnatm/natm_pcb.c	Thu Nov  7 12:33:53 1996
@@ -172,7 +172,9 @@
 
 #ifdef DDB
 
-int npcb_dump()
+int npcb_dump(void);
+
+int npcb_dump(void)
 
 {
   struct natmpcb *cpcb;
@@ -180,7 +182,7 @@
   printf("npcb dump:\n");
   for (cpcb = natm_pcbs.lh_first ; cpcb != NULL ; 
 					cpcb = cpcb->pcblist.le_next) {
-    printf("if=%s, vci=%d, vpi=%d, IP=0x%x, sock=0x%x, flags=0x%x, inq=%d\n",
+    printf("if=%s, vci=%d, vpi=%d, IP=0x%x, sock=%p, flags=0x%x, inq=%d\n",
 	cpcb->npcb_ifp->if_xname, cpcb->npcb_vci, cpcb->npcb_vpi,
 	cpcb->ipaddr.s_addr, cpcb->npcb_socket, 
 	cpcb->npcb_flags, cpcb->npcb_inq);

>Audit-Trail:
>Unformatted: