Module Name: src
Committed By: christos
Date: Wed Sep 12 21:57:18 UTC 2018
Modified Files:
src/sys/dev/usb: if_athn_usb.c if_axe.c if_axen.c if_rum.c if_run.c
if_urtw.c if_urtwn.c
Log Message:
Don't have modules depend on bpf; they will find the dependency dynamically
at runtime. Otherwise builtin modules will complain about non-builtin bpf.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/if_athn_usb.c \
src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/if_axen.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/if_rum.c \
src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/usb/if_urtw.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/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.29 src/sys/dev/usb/if_athn_usb.c:1.30
--- src/sys/dev/usb/if_athn_usb.c:1.29 Thu Aug 2 02:09:04 2018
+++ src/sys/dev/usb/if_athn_usb.c Wed Sep 12 17:57:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.29 2018/08/02 06:09:04 riastradh Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.30 2018/09/12 21:57:18 christos Exp $ */
/* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.29 2018/08/02 06:09:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.30 2018/09/12 21:57:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2974,7 +2974,7 @@ athn_usb_stop_locked(struct ifnet *ifp)
athn_set_power_sleep(sc);
}
-MODULE(MODULE_CLASS_DRIVER, if_athn_usb, "bpf");
+MODULE(MODULE_CLASS_DRIVER, if_athn_usb, NULL);
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.29 src/sys/dev/usb/if_run.c:1.30
--- src/sys/dev/usb/if_run.c:1.29 Thu Aug 2 02:09:04 2018
+++ src/sys/dev/usb/if_run.c Wed Sep 12 17:57:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_run.c,v 1.29 2018/08/02 06:09:04 riastradh Exp $ */
+/* $NetBSD: if_run.c,v 1.30 2018/09/12 21:57:18 christos Exp $ */
/* $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.29 2018/08/02 06:09:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.30 2018/09/12 21:57:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -4842,7 +4842,7 @@ run_setup_beacon(struct run_softc *sc)
}
#endif
-MODULE(MODULE_CLASS_DRIVER, if_run, "bpf");
+MODULE(MODULE_CLASS_DRIVER, if_run, NULL);
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.92 src/sys/dev/usb/if_axe.c:1.93
--- src/sys/dev/usb/if_axe.c:1.92 Thu Aug 2 02:09:04 2018
+++ src/sys/dev/usb/if_axe.c Wed Sep 12 17:57:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.92 2018/08/02 06:09:04 riastradh Exp $ */
+/* $NetBSD: if_axe.c,v 1.93 2018/09/12 21:57:18 christos Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.92 2018/08/02 06:09:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.93 2018/09/12 21:57:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1962,7 +1962,7 @@ axe_stop(struct ifnet *ifp, int disable)
sc->axe_link = 0;
}
-MODULE(MODULE_CLASS_DRIVER, if_axe, "bpf");
+MODULE(MODULE_CLASS_DRIVER, if_axe, NULL);
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.16 src/sys/dev/usb/if_axen.c:1.17
--- src/sys/dev/usb/if_axen.c:1.16 Thu Aug 2 02:09:04 2018
+++ src/sys/dev/usb/if_axen.c Wed Sep 12 17:57:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.16 2018/08/02 06:09:04 riastradh Exp $ */
+/* $NetBSD: if_axen.c,v 1.17 2018/09/12 21:57:18 christos Exp $ */
/* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.16 2018/08/02 06:09:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.17 2018/09/12 21:57:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1560,7 +1560,7 @@ axen_stop(struct ifnet *ifp, int disable
sc->axen_link = 0;
}
-MODULE(MODULE_CLASS_DRIVER, if_axen, "bpf");
+MODULE(MODULE_CLASS_DRIVER, if_axen, NULL);
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.63 src/sys/dev/usb/if_rum.c:1.64
--- src/sys/dev/usb/if_rum.c:1.63 Thu Aug 2 02:09:04 2018
+++ src/sys/dev/usb/if_rum.c Wed Sep 12 17:57:18 2018
@@ -1,5 +1,5 @@
/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */
-/* $NetBSD: if_rum.c,v 1.63 2018/08/02 06:09:04 riastradh Exp $ */
+/* $NetBSD: if_rum.c,v 1.64 2018/09/12 21:57:18 christos Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergam...@free.fr>
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.63 2018/08/02 06:09:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.64 2018/09/12 21:57:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2286,7 +2286,7 @@ rum_activate(device_t self, enum devact
}
}
-MODULE(MODULE_CLASS_DRIVER, if_rum, "bpf");
+MODULE(MODULE_CLASS_DRIVER, if_rum, NULL);
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.63 src/sys/dev/usb/if_urtwn.c:1.64
--- src/sys/dev/usb/if_urtwn.c:1.63 Thu Aug 2 02:09:04 2018
+++ src/sys/dev/usb/if_urtwn.c Wed Sep 12 17:57:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.63 2018/08/02 06:09:04 riastradh Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.64 2018/09/12 21:57:18 christos Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.63 2018/08/02 06:09:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.64 2018/09/12 21:57:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -5093,7 +5093,7 @@ urtwn_delay_ms(struct urtwn_softc *sc, i
usbd_delay_ms(sc->sc_udev, ms);
}
-MODULE(MODULE_CLASS_DRIVER, if_urtwn, "bpf");
+MODULE(MODULE_CLASS_DRIVER, if_urtwn, NULL);
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/usb/if_urtw.c
diff -u src/sys/dev/usb/if_urtw.c:1.17 src/sys/dev/usb/if_urtw.c:1.18
--- src/sys/dev/usb/if_urtw.c:1.17 Thu Aug 2 02:09:04 2018
+++ src/sys/dev/usb/if_urtw.c Wed Sep 12 17:57:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtw.c,v 1.17 2018/08/02 06:09:04 riastradh Exp $ */
+/* $NetBSD: if_urtw.c,v 1.18 2018/09/12 21:57:18 christos Exp $ */
/* $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.17 2018/08/02 06:09:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.18 2018/09/12 21:57:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -4056,7 +4056,7 @@ fail:
return error;
}
-MODULE(MODULE_CLASS_DRIVER, if_urtw, "bpf");
+MODULE(MODULE_CLASS_DRIVER, if_urtw, NULL);
#ifdef _MODULE
#include "ioconf.c"
