diff options
| author | Rafael Vanoni <rafael.vanoni@sun.com> | 2009-11-13 01:32:32 -0800 |
|---|---|---|
| committer | Rafael Vanoni <rafael.vanoni@sun.com> | 2009-11-13 01:32:32 -0800 |
| commit | d3d50737e566cade9a08d73d2af95105ac7cd960 (patch) | |
| tree | 399b76a3f6bf107e2ff506d8f9c3333654b29fc7 /usr/src/uts/common/io/net80211/net80211_ioctl.c | |
| parent | 1eff5f7761619411b3c31280fcd96cefc32968b7 (diff) | |
| download | illumos-gate-d3d50737e566cade9a08d73d2af95105ac7cd960.tar.gz | |
PSARC/2009/396 Tickless Kernel Architecture / lbolt decoupling
6860030 tickless clock requires a clock() decoupled lbolt / lbolt64
Portions contributed by Chad Mynhier <cmynhier@gmail.com>
Diffstat (limited to 'usr/src/uts/common/io/net80211/net80211_ioctl.c')
| -rw-r--r-- | usr/src/uts/common/io/net80211/net80211_ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/io/net80211/net80211_ioctl.c b/usr/src/uts/common/io/net80211/net80211_ioctl.c index f541e52902..93212719e3 100644 --- a/usr/src/uts/common/io/net80211/net80211_ioctl.c +++ b/usr/src/uts/common/io/net80211/net80211_ioctl.c @@ -686,11 +686,11 @@ static void wifi_wait_scan(struct ieee80211com *ic) { ieee80211_impl_t *im = ic->ic_private; + clock_t delta = drv_usectohz(WAIT_SCAN_MAX * 1000); while ((ic->ic_flags & (IEEE80211_F_SCAN | IEEE80211_F_ASCAN)) != 0) { - if (cv_timedwait_sig(&im->im_scan_cv, &ic->ic_genlock, - ddi_get_lbolt() + drv_usectohz(WAIT_SCAN_MAX * 1000)) != - 0) { + if (cv_reltimedwait_sig(&im->im_scan_cv, &ic->ic_genlock, + delta, TR_CLOCK_TICK) != 0) { break; } } |