Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* #include <sys/kmem.h> for kmem_intr_xxx()

Browse Source 
* ansify pcb_add() function signature and make its prototype parameter
  types match its definition.
This commit is contained in:
rtr 2014-07-06 15:44:25 +00:00
parent 9a90188bf9
commit 09cdf1daa9
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/netnatm/natm.h
View File

@ -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);

15
sys/netnatm/natm_pcb.c
View File

@ -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();