diff options
| author |   claudio <claudio@openbsd.org> | 2014-01-19 03:04:54 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2014-01-19 03:04:54 +0000 |
| commit | ae0d6a99687e7a1b0ecc9f1b103fe35016a33996 (patch) | |
| tree | 696df56e636c36087a95642539c1819ea9284c7d | |
| parent | Add makefile for distrib/special/installboot. (diff) | |
| download | wireguard-openbsd-ae0d6a99687e7a1b0ecc9f1b103fe35016a33996.tar.xz wireguard-openbsd-ae0d6a99687e7a1b0ecc9f1b103fe35016a33996.zip | |
Remove max_datalen. It is only used once an can be replaced easily with
MHLEN - max_hdr in that place. OK mikeb@
| -rw-r--r-- | sys/kern/uipc_domain.c | 3 | ||||
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 3 | ||||
| -rw-r--r-- | sys/nfs/nfs_socket.c | 4 | ||||
| -rw-r--r-- | sys/sys/mbuf.h | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index a23fd6440ee..1be2d180fae 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_domain.c,v 1.33 2013/08/20 09:14:21 mpi Exp $ */ +/* $OpenBSD: uipc_domain.c,v 1.34 2014/01/19 03:04:54 claudio Exp $ */ /* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */ /* @@ -114,7 +114,6 @@ domaininit(void) if (max_linkhdr < 16) /* XXX */ max_linkhdr = 16; max_hdr = max_linkhdr + max_protohdr; - max_datalen = MHLEN - max_hdr; timeout_set(&pffast_timeout, pffasttimo, &pffast_timeout); timeout_set(&pfslow_timeout, pfslowtimo, &pfslow_timeout); timeout_add(&pffast_timeout, 1); diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 2ba91c2bad8..fb481c133f1 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf.c,v 1.177 2014/01/10 00:47:17 bluhm Exp $ */ +/* $OpenBSD: uipc_mbuf.c,v 1.178 2014/01/19 03:04:54 claudio Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */ /* @@ -118,7 +118,6 @@ int m_clpool(u_int); int max_linkhdr; /* largest link-level header */ int max_protohdr; /* largest protocol header */ int max_hdr; /* largest link+protocol header */ -int max_datalen; /* MHLEN - max_hdr */ struct timeout m_cltick_tmo; int m_clticks; diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c index bbd4e4c0614..9905f0f845d 100644 --- a/sys/nfs/nfs_socket.c +++ b/sys/nfs/nfs_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_socket.c,v 1.102 2013/07/04 20:05:55 sf Exp $ */ +/* $OpenBSD: nfs_socket.c,v 1.103 2014/01/19 03:04:54 claudio Exp $ */ /* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */ /* @@ -1058,7 +1058,7 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, struct nfssvc_sock *slp, * try and leave leading space for the lower level headers. */ siz += RPC_REPLYSIZ; - if (siz >= max_datalen) { + if (siz >= MHLEN - max_hdr) { MCLGET(mreq, M_WAIT); } else mreq->m_data += max_hdr; diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 0239d2d4fc5..3a9d0ff8adc 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbuf.h,v 1.171 2014/01/11 04:46:15 lteo Exp $ */ +/* $OpenBSD: mbuf.h,v 1.172 2014/01/19 03:04:54 claudio Exp $ */ /* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */ /* @@ -412,7 +412,6 @@ extern int mcllowat; /* mbuf cluster low water mark */ extern int max_linkhdr; /* largest link-level header */ extern int max_protohdr; /* largest protocol header */ extern int max_hdr; /* largest link+protocol header */ -extern int max_datalen; /* MHLEN - max_hdr */ void mbinit(void); struct mbuf *m_copym2(struct mbuf *, int, int, int); |