summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2007-09-05 23:40:59 +0000
committersam <sam@FreeBSD.org>2007-09-05 23:40:59 +0000
commitaa00045c5dab16380783e06c0a19da83fdee1d08 (patch)
tree223005637d6bb097f0b7e7a2be193a078b2a38a9 /sys
parent527eef962e3440e0484314868471050b85af5543 (diff)
downloadFreeBSD-src-aa00045c5dab16380783e06c0a19da83fdee1d08.zip
FreeBSD-src-aa00045c5dab16380783e06c0a19da83fdee1d08.tar.gz
Add missing bg scanning bits; update ic_lastdata and cancel any
bg scan when there's outbound traffic. Approved by: re (blanket wireless)
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/if_zyd.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index fe89cdd..6251150 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -2300,6 +2300,11 @@ zyd_start(struct ifnet *ifp)
break;
}
IFQ_DEQUEUE(&ifp->if_snd, m0);
+ /*
+ * Cancel any background scan.
+ */
+ if (ic->ic_flags & IEEE80211_F_SCAN)
+ ieee80211_cancel_scan(ic);
if (m0->m_len < sizeof(struct ether_header) &&
!(m0 = m_pullup(m0, sizeof(struct ether_header))))
@@ -2328,6 +2333,7 @@ zyd_start(struct ifnet *ifp)
}
sc->tx_timer = 5;
+ ic->ic_lastdata = ticks;
callout_reset(&sc->sc_watchdog_ch, hz, zyd_watchdog, sc);
}
}
OpenPOWER on IntegriCloud