Module Name: src
Committed By: dyoung
Date: Sun Dec 6 20:20:13 UTC 2009
Modified Files:
src/sys/dev/usb: if_atu.c if_aue.c if_axe.c if_cdce.c if_cue.c if_kue.c
if_rum.c if_udav.c if_upl.c if_ural.c if_url.c if_zyd.c
Log Message:
Simplify several device-activation hooks.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/if_atu.c
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/if_axe.c src/sys/dev/usb/if_rum.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/usb/if_upl.c src/sys/dev/usb/if_url.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/if_ural.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/if_zyd.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_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.33 src/sys/dev/usb/if_atu.c:1.34
--- src/sys/dev/usb/if_atu.c:1.33 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/if_atu.c Sun Dec 6 20:20:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.33 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: if_atu.c,v 1.34 2009/12/06 20:20:12 dyoung Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.33 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.34 2009/12/06 20:20:12 dyoung Exp $");
#include "bpfilter.h"
@@ -1429,17 +1429,15 @@
struct atu_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
case DVACT_DEACTIVATE:
if (sc->sc_state != ATU_S_UNCONFIG) {
if_deactivate(&sc->atu_ec.ec_if);
sc->sc_state = ATU_S_DEAD;
}
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
/*
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.115 src/sys/dev/usb/if_aue.c:1.116
--- src/sys/dev/usb/if_aue.c:1.115 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/if_aue.c Sun Dec 6 20:20:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.115 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: if_aue.c,v 1.116 2009/12/06 20:20:12 dyoung Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.115 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.116 2009/12/06 20:20:12 dyoung Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -955,16 +955,13 @@
DPRINTFN(2,("%s: %s: enter\n", device_xname(sc->aue_dev), __func__));
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
if_deactivate(&sc->aue_ec.ec_if);
sc->aue_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
/*
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.29 src/sys/dev/usb/if_axe.c:1.30
--- src/sys/dev/usb/if_axe.c:1.29 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/if_axe.c Sun Dec 6 20:20:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.29 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: if_axe.c,v 1.30 2009/12/06 20:20:12 dyoung Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.29 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.30 2009/12/06 20:20:12 dyoung Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -635,16 +635,13 @@
DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->axe_dev), __func__));
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
if_deactivate(&sc->axe_ec.ec_if);
sc->axe_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
/*
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.29 src/sys/dev/usb/if_rum.c:1.30
--- src/sys/dev/usb/if_rum.c:1.29 Mon Sep 28 10:22:07 2009
+++ src/sys/dev/usb/if_rum.c Sun Dec 6 20:20:12 2009
@@ -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.29 2009/09/28 10:22:07 pooka Exp $ */
+/* $NetBSD: if_rum.c,v 1.30 2009/12/06 20:20:12 dyoung 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.29 2009/09/28 10:22:07 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.30 2009/12/06 20:20:12 dyoung Exp $");
#include "bpfilter.h"
@@ -2287,13 +2287,10 @@
rum_activate(device_ptr_t self, enum devact act)
{
switch (act) {
- case DVACT_ACTIVATE:
- return EOPNOTSUPP;
-
case DVACT_DEACTIVATE:
/*if_deactivate(&sc->sc_ic.ic_if);*/
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
-
- return 0;
}
Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.25 src/sys/dev/usb/if_cdce.c:1.26
--- src/sys/dev/usb/if_cdce.c:1.25 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/if_cdce.c Sun Dec 6 20:20:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.25 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: if_cdce.c,v 1.26 2009/12/06 20:20:12 dyoung Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wp...@windriver.com>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.25 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.26 2009/12/06 20:20:12 dyoung Exp $");
#include "bpfilter.h"
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -790,16 +790,13 @@
struct cdce_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
if_deactivate(GET_IFP(sc));
sc->cdce_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.55 src/sys/dev/usb/if_cue.c:1.56
--- src/sys/dev/usb/if_cue.c:1.55 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/if_cue.c Sun Dec 6 20:20:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.55 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: if_cue.c,v 1.56 2009/12/06 20:20:12 dyoung Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.55 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.56 2009/12/06 20:20:12 dyoung Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -648,17 +648,14 @@
DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev), __func__));
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
/* Deactivate the interface. */
if_deactivate(&sc->cue_ec.ec_if);
sc->cue_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
/*
Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.66 src/sys/dev/usb/if_kue.c:1.67
--- src/sys/dev/usb/if_kue.c:1.66 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/if_kue.c Sun Dec 6 20:20:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.66 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: if_kue.c,v 1.67 2009/12/06 20:20:12 dyoung Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.66 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.67 2009/12/06 20:20:12 dyoung Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -593,19 +593,14 @@
DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __func__));
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
-#if defined(__NetBSD__)
/* Deactivate the interface. */
if_deactivate(&sc->kue_ec.ec_if);
-#endif
sc->kue_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
/*
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.26 src/sys/dev/usb/if_udav.c:1.27
--- src/sys/dev/usb/if_udav.c:1.26 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/if_udav.c Sun Dec 6 20:20:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.26 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: if_udav.c,v 1.27 2009/12/06 20:20:12 dyoung Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
* Copyright (c) 2003
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.26 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.27 2009/12/06 20:20:12 dyoung Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -736,16 +736,13 @@
DPRINTF(("%s: %s: enter, act=%d\n", USBDEVNAME(sc->sc_dev),
__func__, act));
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
if_deactivate(&sc->sc_ec.ec_if);
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
#define UDAV_BITS 6
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.34 src/sys/dev/usb/if_upl.c:1.35
--- src/sys/dev/usb/if_upl.c:1.34 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/if_upl.c Sun Dec 6 20:20:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.34 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: if_upl.c,v 1.35 2009/12/06 20:20:12 dyoung Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.34 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.35 2009/12/06 20:20:12 dyoung Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -377,17 +377,14 @@
DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
/* Deactivate the interface. */
if_deactivate(&sc->sc_if);
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
/*
Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.34 src/sys/dev/usb/if_url.c:1.35
--- src/sys/dev/usb/if_url.c:1.34 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/if_url.c Sun Dec 6 20:20:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_url.c,v 1.34 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: if_url.c,v 1.35 2009/12/06 20:20:12 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <n...@nabechan.org>. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.34 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.35 2009/12/06 20:20:12 dyoung Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -617,17 +617,13 @@
__func__, act));
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
if_deactivate(&sc->sc_ec.ec_if);
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
-
- return (0);
}
#define url_calchash(addr) (ether_crc32_be((addr), ETHER_ADDR_LEN) >> 26)
Index: src/sys/dev/usb/if_ural.c
diff -u src/sys/dev/usb/if_ural.c:1.32 src/sys/dev/usb/if_ural.c:1.33
--- src/sys/dev/usb/if_ural.c:1.32 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/if_ural.c Sun Dec 6 20:20:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ural.c,v 1.32 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: if_ural.c,v 1.33 2009/12/06 20:20:12 dyoung Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.32 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.33 2009/12/06 20:20:12 dyoung Exp $");
#include "bpfilter.h"
@@ -2306,16 +2306,12 @@
struct ural_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- return EOPNOTSUPP;
- break;
-
case DVACT_DEACTIVATE:
if_deactivate(&sc->sc_if);
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
-
- return 0;
}
Static void
Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.22 src/sys/dev/usb/if_zyd.c:1.23
--- src/sys/dev/usb/if_zyd.c:1.22 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/if_zyd.c Sun Dec 6 20:20:12 2009
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/* $NetBSD: if_zyd.c,v 1.22 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: if_zyd.c,v 1.23 2009/12/06 20:20:12 dyoung Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -22,7 +22,7 @@
* ZyDAS ZD1211/ZD1211B USB WLAN driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.22 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.23 2009/12/06 20:20:12 dyoung Exp $");
#include "bpfilter.h"
@@ -2693,12 +2693,10 @@
struct zyd_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- break;
-
case DVACT_DEACTIVATE:
if_deactivate(&sc->sc_if);
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return 0;
}
