Module Name: src
Committed By: jmcneill
Date: Sun Feb 20 03:55:56 UTC 2011
Modified Files:
src/sys/dev/ic: ath.c ath_netbsd.c athrate-sample.c
Log Message:
support building as a module
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/ic/ath.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/ath_netbsd.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/athrate-sample.c
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/ic/ath.c
diff -u src/sys/dev/ic/ath.c:1.109 src/sys/dev/ic/ath.c:1.110
--- src/sys/dev/ic/ath.c:1.109 Mon Apr 5 07:19:33 2010
+++ src/sys/dev/ic/ath.c Sun Feb 20 03:55:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.109 2010/04/05 07:19:33 joerg Exp $ */
+/* $NetBSD: ath.c,v 1.110 2011/02/20 03:55:56 jmcneill Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.109 2010/04/05 07:19:33 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.110 2011/02/20 03:55:56 jmcneill Exp $");
#endif
/*
@@ -51,7 +51,9 @@
* is greatly appreciated.
*/
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/reboot.h>
Index: src/sys/dev/ic/ath_netbsd.c
diff -u src/sys/dev/ic/ath_netbsd.c:1.18 src/sys/dev/ic/ath_netbsd.c:1.19
--- src/sys/dev/ic/ath_netbsd.c:1.18 Fri Jan 21 17:46:19 2011
+++ src/sys/dev/ic/ath_netbsd.c Sun Feb 20 03:55:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ath_netbsd.c,v 1.18 2011/01/21 17:46:19 dyoung Exp $ */
+/* $NetBSD: ath_netbsd.c,v 1.19 2011/02/20 03:55:56 jmcneill Exp $ */
/*-
* Copyright (c) 2003, 2004 David Young
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.18 2011/01/21 17:46:19 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.19 2011/02/20 03:55:56 jmcneill Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -44,6 +44,7 @@
#include <machine/stdarg.h>
#include <sys/endian.h>
#include <sys/device.h>
+#include <sys/module.h>
#include <net/if.h>
#include <net/if_dl.h>
@@ -521,3 +522,17 @@
err:
printf("%s: sysctl_createv failed, rc = %d\n", __func__, rc);
}
+
+MODULE(MODULE_CLASS_MISC, ath, "ath_hal");
+
+static int
+ath_modcmd(modcmd_t cmd, void *opaque)
+{
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ case MODULE_CMD_FINI:
+ return 0;
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/dev/ic/athrate-sample.c
diff -u src/sys/dev/ic/athrate-sample.c:1.17 src/sys/dev/ic/athrate-sample.c:1.18
--- src/sys/dev/ic/athrate-sample.c:1.17 Thu Dec 11 05:45:29 2008
+++ src/sys/dev/ic/athrate-sample.c Sun Feb 20 03:55:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: athrate-sample.c,v 1.17 2008/12/11 05:45:29 alc Exp $ */
+/* $NetBSD: athrate-sample.c,v 1.18 2011/02/20 03:55:56 jmcneill Exp $ */
/*-
* Copyright (c) 2005 John Bicket
@@ -41,14 +41,16 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.9 2005/07/22 16:50:17 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: athrate-sample.c,v 1.17 2008/12/11 05:45:29 alc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athrate-sample.c,v 1.18 2011/02/20 03:55:56 jmcneill Exp $");
#endif
/*
* John Bicket's SampleRate control algorithm.
*/
+#ifdef _KERNEL_OPT
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
