svn commit: r213542 - in user/weongyo/usb/sys/dev/usb: . net
Weongyo Jeong
weongyo at FreeBSD.org
Fri Oct 8 01:54:27 UTC 2010
Author: weongyo
Date: Fri Oct 8 01:54:27 2010
New Revision: 213542
URL: http://svn.freebsd.org/changeset/base/213542
Log:
A trivial macro renaming.
Modified:
user/weongyo/usb/sys/dev/usb/net/if_aue.c
user/weongyo/usb/sys/dev/usb/net/if_axe.c
user/weongyo/usb/sys/dev/usb/net/if_cue.c
user/weongyo/usb/sys/dev/usb/net/if_kue.c
user/weongyo/usb/sys/dev/usb/net/if_rue.c
user/weongyo/usb/sys/dev/usb/net/if_udav.c
user/weongyo/usb/sys/dev/usb/usb_sleepout.h
Modified: user/weongyo/usb/sys/dev/usb/net/if_aue.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_aue.c Fri Oct 8 01:53:33 2010 (r213541)
+++ user/weongyo/usb/sys/dev/usb/net/if_aue.c Fri Oct 8 01:54:27 2010 (r213542)
@@ -766,8 +766,8 @@ aue_detach(device_t dev)
struct ifnet *ifp = sc->sc_ifp;
sleepout_drain(&sc->sc_watchdog);
- SLEEPOUT_DRAIN_TASK(&sc->sc_sleepout, &sc->sc_setpromisc);
- SLEEPOUT_DRAIN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_DRAINTASK(&sc->sc_sleepout, &sc->sc_setpromisc);
+ SLEEPOUT_DRAINTASK(&sc->sc_sleepout, &sc->sc_setmulti);
usbd_transfer_unsetup(sc->sc_xfer, AUE_N_TRANSFER);
if (sc->sc_miibus != NULL)
@@ -1153,7 +1153,7 @@ aue_ioctl(struct ifnet *ifp, u_long comm
AUE_LOCK(sc);
if (ifp->if_flags & IFF_UP) {
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
- SLEEPOUT_RUN_TASK(&sc->sc_sleepout,
+ SLEEPOUT_RUNTASK(&sc->sc_sleepout,
&sc->sc_setpromisc);
else
aue_init_locked(sc);
@@ -1165,7 +1165,7 @@ aue_ioctl(struct ifnet *ifp, u_long comm
case SIOCDELMULTI:
if (ifp->if_flags & IFF_UP &&
ifp->if_drv_flags & IFF_DRV_RUNNING)
- SLEEPOUT_RUN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_RUNTASK(&sc->sc_sleepout, &sc->sc_setmulti);
break;
case SIOCGIFMEDIA:
case SIOCSIFMEDIA:
Modified: user/weongyo/usb/sys/dev/usb/net/if_axe.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_axe.c Fri Oct 8 01:53:33 2010 (r213541)
+++ user/weongyo/usb/sys/dev/usb/net/if_axe.c Fri Oct 8 01:54:27 2010 (r213542)
@@ -849,8 +849,8 @@ axe_detach(device_t dev)
struct ifnet *ifp = sc->sc_ifp;
sleepout_drain(&sc->sc_watchdog);
- SLEEPOUT_DRAIN_TASK(&sc->sc_sleepout, &sc->sc_setpromisc);
- SLEEPOUT_DRAIN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_DRAINTASK(&sc->sc_sleepout, &sc->sc_setpromisc);
+ SLEEPOUT_DRAINTASK(&sc->sc_sleepout, &sc->sc_setmulti);
usbd_transfer_unsetup(sc->sc_xfer, AXE_N_TRANSFER);
if (sc->sc_miibus != NULL)
@@ -1300,7 +1300,7 @@ axe_ioctl(struct ifnet *ifp, u_long comm
AXE_LOCK(sc);
if (ifp->if_flags & IFF_UP) {
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
- SLEEPOUT_RUN_TASK(&sc->sc_sleepout,
+ SLEEPOUT_RUNTASK(&sc->sc_sleepout,
&sc->sc_setpromisc);
else
axe_init_locked(sc);
@@ -1312,7 +1312,7 @@ axe_ioctl(struct ifnet *ifp, u_long comm
case SIOCDELMULTI:
if (ifp->if_flags & IFF_UP &&
ifp->if_drv_flags & IFF_DRV_RUNNING)
- SLEEPOUT_RUN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_RUNTASK(&sc->sc_sleepout, &sc->sc_setmulti);
break;
case SIOCGIFMEDIA:
case SIOCSIFMEDIA:
Modified: user/weongyo/usb/sys/dev/usb/net/if_cue.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_cue.c Fri Oct 8 01:53:33 2010 (r213541)
+++ user/weongyo/usb/sys/dev/usb/net/if_cue.c Fri Oct 8 01:54:27 2010 (r213542)
@@ -467,8 +467,8 @@ cue_detach(device_t dev)
struct ifnet *ifp = sc->sc_ifp;
sleepout_drain(&sc->sc_watchdog);
- SLEEPOUT_DRAIN_TASK(&sc->sc_sleepout, &sc->sc_setpromisc);
- SLEEPOUT_DRAIN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_DRAINTASK(&sc->sc_sleepout, &sc->sc_setpromisc);
+ SLEEPOUT_DRAINTASK(&sc->sc_sleepout, &sc->sc_setmulti);
usbd_transfer_unsetup(sc->sc_xfer, CUE_N_TRANSFER);
if (ifp != NULL) {
CUE_LOCK(sc);
@@ -780,7 +780,7 @@ cue_ioctl(struct ifnet *ifp, u_long comm
CUE_LOCK(sc);
if (ifp->if_flags & IFF_UP) {
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
- SLEEPOUT_RUN_TASK(&sc->sc_sleepout,
+ SLEEPOUT_RUNTASK(&sc->sc_sleepout,
&sc->sc_setpromisc);
else
cue_init_locked(sc);
@@ -792,7 +792,7 @@ cue_ioctl(struct ifnet *ifp, u_long comm
case SIOCDELMULTI:
if (ifp->if_flags & IFF_UP &&
ifp->if_drv_flags & IFF_DRV_RUNNING)
- SLEEPOUT_RUN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_RUNTASK(&sc->sc_sleepout, &sc->sc_setmulti);
break;
default:
error = ether_ioctl(ifp, command, data);
Modified: user/weongyo/usb/sys/dev/usb/net/if_kue.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_kue.c Fri Oct 8 01:53:33 2010 (r213541)
+++ user/weongyo/usb/sys/dev/usb/net/if_kue.c Fri Oct 8 01:54:27 2010 (r213542)
@@ -527,7 +527,7 @@ kue_detach(device_t dev)
struct kue_softc *sc = device_get_softc(dev);
struct ifnet *ifp = sc->sc_ifp;
- SLEEPOUT_DRAIN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_DRAINTASK(&sc->sc_sleepout, &sc->sc_setmulti);
usbd_transfer_unsetup(sc->sc_xfer, KUE_N_TRANSFER);
if (ifp != NULL) {
KUE_LOCK(sc);
@@ -821,7 +821,7 @@ kue_ioctl(struct ifnet *ifp, u_long comm
case SIOCDELMULTI:
if (ifp->if_flags & IFF_UP &&
ifp->if_drv_flags & IFF_DRV_RUNNING)
- SLEEPOUT_RUN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_RUNTASK(&sc->sc_sleepout, &sc->sc_setmulti);
break;
default:
error = ether_ioctl(ifp, command, data);
Modified: user/weongyo/usb/sys/dev/usb/net/if_rue.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_rue.c Fri Oct 8 01:53:33 2010 (r213541)
+++ user/weongyo/usb/sys/dev/usb/net/if_rue.c Fri Oct 8 01:54:27 2010 (r213542)
@@ -657,8 +657,8 @@ rue_detach(device_t dev)
struct ifnet *ifp = sc->sc_ifp;
sleepout_drain(&sc->sc_watchdog);
- SLEEPOUT_DRAIN_TASK(&sc->sc_sleepout, &sc->sc_setpromisc);
- SLEEPOUT_DRAIN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_DRAINTASK(&sc->sc_sleepout, &sc->sc_setpromisc);
+ SLEEPOUT_DRAINTASK(&sc->sc_sleepout, &sc->sc_setmulti);
usbd_transfer_unsetup(sc->sc_xfer, RUE_N_TRANSFER);
if (sc->sc_miibus != NULL)
device_delete_child(sc->sc_dev, sc->sc_miibus);
@@ -1058,7 +1058,7 @@ rue_ioctl(struct ifnet *ifp, u_long comm
RUE_LOCK(sc);
if (ifp->if_flags & IFF_UP) {
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
- SLEEPOUT_RUN_TASK(&sc->sc_sleepout,
+ SLEEPOUT_RUNTASK(&sc->sc_sleepout,
&sc->sc_setpromisc);
else
rue_init_locked(sc);
@@ -1070,7 +1070,7 @@ rue_ioctl(struct ifnet *ifp, u_long comm
case SIOCDELMULTI:
if (ifp->if_flags & IFF_UP &&
ifp->if_drv_flags & IFF_DRV_RUNNING)
- SLEEPOUT_RUN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_RUNTASK(&sc->sc_sleepout, &sc->sc_setmulti);
break;
case SIOCGIFMEDIA:
case SIOCSIFMEDIA:
Modified: user/weongyo/usb/sys/dev/usb/net/if_udav.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_udav.c Fri Oct 8 01:53:33 2010 (r213541)
+++ user/weongyo/usb/sys/dev/usb/net/if_udav.c Fri Oct 8 01:54:27 2010 (r213542)
@@ -306,8 +306,8 @@ udav_detach(device_t dev)
struct ifnet *ifp = sc->sc_ifp;
sleepout_drain(&sc->sc_watchdog);
- SLEEPOUT_DRAIN_TASK(&sc->sc_sleepout, &sc->sc_setpromisc);
- SLEEPOUT_DRAIN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_DRAINTASK(&sc->sc_sleepout, &sc->sc_setpromisc);
+ SLEEPOUT_DRAINTASK(&sc->sc_sleepout, &sc->sc_setmulti);
usbd_transfer_unsetup(sc->sc_xfer, UDAV_N_TRANSFER);
if (sc->sc_miibus != NULL)
@@ -995,7 +995,7 @@ udav_ioctl(struct ifnet *ifp, u_long com
UDAV_LOCK(sc);
if (ifp->if_flags & IFF_UP) {
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
- SLEEPOUT_RUN_TASK(&sc->sc_sleepout,
+ SLEEPOUT_RUNTASK(&sc->sc_sleepout,
&sc->sc_setpromisc);
else
udav_init_locked(sc);
@@ -1007,7 +1007,7 @@ udav_ioctl(struct ifnet *ifp, u_long com
case SIOCDELMULTI:
if (ifp->if_flags & IFF_UP &&
ifp->if_drv_flags & IFF_DRV_RUNNING)
- SLEEPOUT_RUN_TASK(&sc->sc_sleepout, &sc->sc_setmulti);
+ SLEEPOUT_RUNTASK(&sc->sc_sleepout, &sc->sc_setmulti);
break;
case SIOCGIFMEDIA:
case SIOCSIFMEDIA:
Modified: user/weongyo/usb/sys/dev/usb/usb_sleepout.h
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_sleepout.h Fri Oct 8 01:53:33 2010 (r213541)
+++ user/weongyo/usb/sys/dev/usb/usb_sleepout.h Fri Oct 8 01:54:27 2010 (r213542)
@@ -35,8 +35,10 @@ struct sleepout_task {
void *st_arg;
};
-#define SLEEPOUT_RUN_TASK(_so, _task) \
+#define SLEEPOUT_RUNTASK(_so, _task) \
taskqueue_enqueue((_so)->s_taskqueue, (_task))
+#define SLEEPOUT_DRAINTASK(_so, _task) \
+ taskqueue_drain((_so)->s_taskqueue, (_task))
void sleepout_create(struct sleepout *, const char *);
void sleepout_free(struct sleepout *);
More information about the svn-src-user
mailing list