Module Name: src
Committed By: rtr
Date: Sun Jul 6 15:44:25 UTC 2014
Modified Files:
src/sys/netnatm: natm.h natm_pcb.c
Log Message:
* #include <sys/kmem.h> for kmem_intr_xxx()
* ansify pcb_add() function signature and make its prototype parameter
types match its definition.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/netnatm/natm.h
cvs rdiff -u -r1.15 -r1.16 src/sys/netnatm/natm_pcb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netnatm/natm.h
diff -u src/sys/netnatm/natm.h:1.13 src/sys/netnatm/natm.h:1.14
--- src/sys/netnatm/natm.h:1.13 Mon May 19 02:51:25 2014
+++ src/sys/netnatm/natm.h Sun Jul 6 15:44:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: natm.h,v 1.13 2014/05/19 02:51:25 rmind Exp $ */
+/* $NetBSD: natm.h,v 1.14 2014/07/06 15:44:25 rtr Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -133,7 +133,7 @@ struct atm_rawioctl {
/* natm_pcb.c */
struct natmpcb *npcb_alloc(bool);
void npcb_free(struct natmpcb *, int);
-struct natmpcb *npcb_add(struct natmpcb *, struct ifnet *, int, int);
+struct natmpcb *npcb_add(struct natmpcb *, struct ifnet *, u_int16_t, u_int8_t);
/* natm.c */
int natm0_sysctl(int *, u_int, void *, size_t *, void *, size_t);
Index: src/sys/netnatm/natm_pcb.c
diff -u src/sys/netnatm/natm_pcb.c:1.15 src/sys/netnatm/natm_pcb.c:1.16
--- src/sys/netnatm/natm_pcb.c:1.15 Mon May 19 02:51:25 2014
+++ src/sys/netnatm/natm_pcb.c Sun Jul 6 15:44:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: natm_pcb.c,v 1.15 2014/05/19 02:51:25 rmind Exp $ */
+/* $NetBSD: natm_pcb.c,v 1.16 2014/07/06 15:44:25 rtr Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -31,11 +31,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.15 2014/05/19 02:51:25 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.16 2014/07/06 15:44:25 rtr Exp $");
#include "opt_ddb.h"
#include <sys/param.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <sys/queue.h>
#include <sys/socket.h>
@@ -98,13 +99,9 @@ npcb_free(struct natmpcb *npcb, int op)
* returns npcb if ok
*/
-struct natmpcb *npcb_add(npcb, ifp, vci, vpi)
-
-struct natmpcb *npcb;
-struct ifnet *ifp;
-u_int16_t vci;
-u_int8_t vpi;
-
+struct natmpcb *
+npcb_add(struct natmpcb *npcb, struct ifnet *ifp,
+ u_int16_t vci, u_int8_t vpi)
{
struct natmpcb *cpcb = NULL; /* current pcb */
int s = splnet();
