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

Since we decided "const struct mbuf *" would not do the right thing (tm), 

remove ~all const from mbuf pointers.
This commit is contained in:
martin 2005-06-06 06:06:50 +00:00
parent e9f82d8da2
commit 71d020f371
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/uipc_mbuf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_mbuf.c,v 1.99 2005/06/06 04:50:28 martin Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.100 2005/06/06 06:06:50 martin Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.99 2005/06/06 04:50:28 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.100 2005/06/06 06:06:50 martin Exp $");
#include "opt_mbuftrace.h"
@ -668,7 +668,7 @@ nospace:
* continuing for "len" bytes, into the indicated buffer.
*/
void
m_copydata(const struct mbuf *m, int off, int len, void *vp)
m_copydata(struct mbuf *m, int off, int len, void *vp)
{
unsigned count;
caddr_t cp = vp;

6
sys/net/if_gif.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gif.c,v 1.53 2005/06/02 10:54:58 tron Exp $ */
/* $NetBSD: if_gif.c,v 1.54 2005/06/06 06:06:50 martin Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.53 2005/06/02 10:54:58 tron Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.54 2005/06/06 06:06:50 martin Exp $");
#include "opt_inet.h"
#include "opt_iso.h"
@ -218,7 +218,7 @@ gif_start(ifp)
#ifdef GIF_ENCAPCHECK
int
gif_encapcheck(m, off, proto, arg)
const struct mbuf *m;
struct mbuf *m;
int off;
int proto;
void *arg;

4
sys/net/if_gif.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gif.h,v 1.9 2002/11/11 18:35:27 itojun Exp $ */
/* $NetBSD: if_gif.h,v 1.10 2005/06/06 06:06:50 martin Exp $ */
/* $KAME: if_gif.h,v 1.23 2001/07/27 09:21:42 itojun Exp $ */
/*
@ -85,7 +85,7 @@ int gif_ioctl __P((struct ifnet *, u_long, caddr_t));
int gif_set_tunnel __P((struct ifnet *, struct sockaddr *, struct sockaddr *));
void gif_delete_tunnel __P((struct ifnet *));
#ifdef GIF_ENCAPCHECK
int gif_encapcheck __P((const struct mbuf *, int, int, void *));
int gif_encapcheck __P((struct mbuf *, int, int, void *));
#endif
#endif /* _NET_IF_GIF_H_ */

4
sys/netinet/in_gif.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: in_gif.h,v 1.11 2005/01/31 23:49:36 kim Exp $ */
/* $NetBSD: in_gif.h,v 1.12 2005/06/06 06:06:50 martin Exp $ */
/* $KAME: in_gif.h,v 1.6 2001/07/25 00:55:48 itojun Exp $ */
/*
@ -41,7 +41,7 @@ struct gif_softc;
void in_gif_input(struct mbuf *, ...);
int in_gif_output(struct ifnet *, int, struct mbuf *);
#ifdef GIF_ENCAPCHECK
int gif_encapcheck4(const struct mbuf *, int, int, void *);
int gif_encapcheck4(struct mbuf *, int, int, void *);
#endif
int in_gif_attach(struct gif_softc *);
int in_gif_detach(struct gif_softc *);

4
sys/netinet/ip_encap.c
View File

@ -70,7 +70,7 @@
#define USE_RADIX
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.25 2005/06/03 21:40:56 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.26 2005/06/06 06:06:50 martin Exp $");
#include "opt_mrouting.h"
#include "opt_inet.h"
@ -645,7 +645,7 @@ fail:
const struct encaptab *
encap_attach_func(int af, int proto,
int (*func)(const struct mbuf *, int, int, void *),
int (*func)(struct mbuf *, int, int, void *),
const struct protosw *psw, void *arg)
{
struct encaptab *ep;

6
sys/netinet/ip_encap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_encap.h,v 1.8 2005/06/03 21:40:56 martin Exp $ */
/* $NetBSD: ip_encap.h,v 1.9 2005/06/06 06:06:50 martin Exp $ */
/* $KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $ */
/*
@ -50,7 +50,7 @@ struct encaptab {
struct sockaddr *srcmask;
struct sockaddr *dst; /* remote addr */
struct sockaddr *dstmask;
int (*func) (const struct mbuf *, int, int, void *);
int (*func) (struct mbuf *, int, int, void *);
const struct protosw *psw; /* only pr_input will be used */
void *arg; /* passed via PACKET_TAG_ENCAP */
};
@ -63,7 +63,7 @@ const struct encaptab *encap_attach(int, int, const struct sockaddr *,
const struct sockaddr *, const struct sockaddr *,
const struct sockaddr *, const struct protosw *, void *);
const struct encaptab *encap_attach_func(int, int,
int (*)(const struct mbuf *, int, int, void *),
int (*)(struct mbuf *, int, int, void *),
const struct protosw *, void *);
void encap6_ctlinput(int, struct sockaddr *, void *);
int encap_detach(const struct encaptab *);

8
sys/netinet/ip_mroute.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_mroute.c,v 1.93 2005/06/06 04:51:06 martin Exp $ */
/* $NetBSD: ip_mroute.c,v 1.94 2005/06/06 06:06:50 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.93 2005/06/06 04:51:06 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.94 2005/06/06 06:06:50 martin Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@ -192,7 +192,7 @@ extern int rsvp_on;
/* vif attachment using sys/netinet/ip_encap.c */
static void vif_input(struct mbuf *, ...);
static int vif_encapcheck(const struct mbuf *, int, int, void *);
static int vif_encapcheck(struct mbuf *, int, int, void *);
static const struct protosw vif_protosw =
{ SOCK_RAW, &inetdomain, IPPROTO_IPV4, PR_ATOMIC|PR_ADDR,
@ -2014,7 +2014,7 @@ vif_input(struct mbuf *m, ...)
* Check if the packet should be grabbed by us.
*/
static int
vif_encapcheck(const struct mbuf *m, int off, int proto, void *arg)
vif_encapcheck(struct mbuf *m, int off, int proto, void *arg)
{
struct vif *vifp;
struct ip ip;

6
sys/netipsec/xform_ipip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xform_ipip.c,v 1.10 2005/02/26 22:45:13 perry Exp $ */
/* $NetBSD: xform_ipip.c,v 1.11 2005/06/06 06:06:50 martin Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.10 2005/02/26 22:45:13 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.11 2005/06/06 06:06:50 martin Exp $");
/*
* IP-inside-IP processing
@ -700,7 +700,7 @@ static struct ipprotosw ipe4_protosw[] = {
* Check the encapsulated packet to see if we want it
*/
static int
ipe4_encapcheck(const struct mbuf *m, int off, int proto, void *arg)
ipe4_encapcheck(struct mbuf *m, int off, int proto, void *arg)
{
/*
* Only take packets coming from IPSEC tunnels; the rest

4
sys/sys/mbuf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: mbuf.h,v 1.111 2005/06/06 04:50:28 martin Exp $ */
/* $NetBSD: mbuf.h,v 1.112 2005/06/06 06:06:50 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2001 The NetBSD Foundation, Inc.
@ -833,7 +833,7 @@ int m_mballoc(int, int);
void m_copyback(struct mbuf *, int, int, const void *);
struct mbuf *m_copyback_cow(struct mbuf *, int, int, const void *, int);
int m_makewritable(struct mbuf **, int, int, int);
void m_copydata(const struct mbuf *, int, int, void *);
void m_copydata(struct mbuf *, int, int, void *);
void m_freem(struct mbuf *);
void m_reclaim(void *, int);
void mbinit(void);