Module Name: src
Committed By: riastradh
Date: Mon Apr 13 15:43:43 UTC 2015
Modified Files:
src/sys/dev/pci: ubsec.c ubsecreg.h ubsecvar.h
Log Message:
Add header guards and necessary includes.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pci/ubsec.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/ubsecreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/ubsecvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ubsec.c
diff -u src/sys/dev/pci/ubsec.c:1.41 src/sys/dev/pci/ubsec.c:1.42
--- src/sys/dev/pci/ubsec.c:1.41 Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/ubsec.c Mon Apr 13 15:43:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsec.c,v 1.41 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: ubsec.c,v 1.42 2015/04/13 15:43:43 riastradh Exp $ */
/* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */
/* $OpenBSD: ubsec.c,v 1.143 2009/03/27 13:31:30 reyk Exp$ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.41 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.42 2015/04/13 15:43:43 riastradh Exp $");
#undef UBSEC_DEBUG
@@ -69,6 +69,8 @@ __KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.
#else
#include <sys/cprng.h>
#include <sys/md5.h>
+ #include <sys/rndpool.h>
+ #include <sys/rndsource.h>
#endif
#include <sys/sha1.h>
Index: src/sys/dev/pci/ubsecreg.h
diff -u src/sys/dev/pci/ubsecreg.h:1.4 src/sys/dev/pci/ubsecreg.h:1.5
--- src/sys/dev/pci/ubsecreg.h:1.4 Sat Apr 19 12:29:24 2014
+++ src/sys/dev/pci/ubsecreg.h Mon Apr 13 15:43:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsecreg.h,v 1.4 2014/04/19 12:29:24 bad Exp $ */
+/* $NetBSD: ubsecreg.h,v 1.5 2015/04/13 15:43:43 riastradh Exp $ */
/* $OpenBSD: ubsecreg.h,v 1.29 2009/03/25 12:17:30 reyk Exp $ */
/*
@@ -32,6 +32,9 @@
*
*/
+#ifndef _DEV_PCI_UBSECREG_H
+#define _DEV_PCI_UBSECREG_H
+
/*
* Register definitions for 5601 BlueSteel Networks Ubiquitous Broadband
* Security "uBSec" chip. Definitions from revision 2.8 of the product
@@ -251,3 +254,5 @@ struct ubsec_ctx_rsapriv {
u_int8_t rpr_buf[5 * 1024 / 8]; /* parameters: */
/* p, q, dp, dq, pinv */
};
+
+#endif /* _DEV_PCI_UBSECREG_H */
Index: src/sys/dev/pci/ubsecvar.h
diff -u src/sys/dev/pci/ubsecvar.h:1.9 src/sys/dev/pci/ubsecvar.h:1.10
--- src/sys/dev/pci/ubsecvar.h:1.9 Sat Apr 19 12:29:24 2014
+++ src/sys/dev/pci/ubsecvar.h Mon Apr 13 15:43:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsecvar.h,v 1.9 2014/04/19 12:29:24 bad Exp $ */
+/* $NetBSD: ubsecvar.h,v 1.10 2015/04/13 15:43:43 riastradh Exp $ */
/* $OpenBSD: ubsecvar.h,v 1.38 2009/03/27 13:31:30 reyk Exp $ */
/*
@@ -32,6 +32,12 @@
*
*/
+#ifndef _DEV_PCI_UBSECVAR_H
+#define _DEV_PCI_UBSECVAR_H
+
+#include <sys/types.h>
+#include <sys/rndsource.h>
+
/* Maximum queue length */
#ifndef UBS_MAX_NQUEUE
#define UBS_MAX_NQUEUE 60
@@ -240,3 +246,5 @@ struct ubsec_stats {
u_int32_t hst_modexp; /* MOD EXP requests */
u_int32_t hst_modexpcrt; /* MOD EXP CRT requests */
};
+
+#endif /* _DEV_PCI_UBSECVAR_H */
