--- sys/dev/usb/if_axereg.h.orig 2007-11-11 01:23:38.000000000 +0900 +++ sys/dev/usb/if_axereg.h 2008-06-02 03:04:49.185709160 +0900 @@ -231,9 +231,10 @@ struct axe_cdata axe_cdata; struct callout_handle axe_stat_ch; struct mtx axe_mtx; - struct sx axe_sleeplock; + struct sx axe_sx; char axe_dying; int axe_link; + int axe_timer; unsigned char axe_ipgs[3]; unsigned char axe_phyaddrs[2]; struct timeval axe_rx_notice; @@ -249,6 +250,6 @@ #define AXE_LOCK(_sc) #define AXE_UNLOCK(_sc) #endif -#define AXE_SLEEPLOCK(_sc) sx_xlock(&(_sc)->axe_sleeplock) -#define AXE_SLEEPUNLOCK(_sc) sx_xunlock(&(_sc)->axe_sleeplock) -#define AXE_SLEEPLOCKASSERT(_sc) sx_assert(&(_sc)->axe_sleeplock, SX_XLOCKED) +#define AXE_SLEEPLOCK(_sc) sx_xlock(&(_sc)->axe_sx) +#define AXE_SLEEPUNLOCK(_sc) sx_xunlock(&(_sc)->axe_sx) +#define AXE_SLEEPLOCKASSERT(_sc) sx_assert(&(_sc)->axe_sx, SX_XLOCKED)