diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-11-24 14:26:55 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-11-24 14:26:55 +0000 |
| commit | 99d62b77374b1f9c1aaab0ced6669c2116bdb0cb (patch) | |
| tree | 19f20396267195080174ce08e9687d187ea60171 | |
| parent | 4ccab8e3f7fa6032b180716879392bd780fa8605 (diff) | |
move MCLPOOLS to if.h and force uipc_mbuf.c to get if.h, there is no
other option
ok dlg
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 6 | ||||
| -rw-r--r-- | sys/net/if.h | 4 | ||||
| -rw-r--r-- | sys/sys/param.h | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index c0c53fb447b..58665cfdb05 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf.c,v 1.95 2008/11/24 12:57:37 dlg Exp $ */ +/* $OpenBSD: uipc_mbuf.c,v 1.96 2008/11/24 14:26:54 deraadt Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */ /* @@ -84,6 +84,10 @@ #include <sys/protosw.h> #include <sys/pool.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <net/if.h> + #include <machine/cpu.h> #include <uvm/uvm_extern.h> diff --git a/sys/net/if.h b/sys/net/if.h index a9b8c02eb12..b1cdb01aa00 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.96 2008/11/24 12:57:37 dlg Exp $ */ +/* $OpenBSD: if.h,v 1.97 2008/11/24 14:26:54 deraadt Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -146,6 +146,8 @@ struct ifqueue { struct timeout *ifq_congestion; }; +#define MCLPOOLS 7 /* number of cluster pools */ + struct mclstat { struct { u_short mcl_alive; diff --git a/sys/sys/param.h b/sys/sys/param.h index 2cf7cb55c0c..790a0fa71ea 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.80 2008/11/24 12:57:37 dlg Exp $ */ +/* $OpenBSD: param.h,v 1.81 2008/11/24 14:26:54 deraadt Exp $ */ /* $NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $ */ /*- @@ -140,7 +140,6 @@ /* 2K cluster can hold Ether frame */ #define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */ #define MCLOFSET (MCLBYTES - 1) -#define MCLPOOLS 7 /* number of cluster pools */ /* * File system parameters and macros. |