diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2007-09-05 23:00:27 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2007-09-05 23:00:27 +0000 |
| commit | 2b9411e29fbcfc03ebddddadfd50204f1e78ee5c (patch) | |
| tree | 30f88a14d8a73fd80df1d360d6a2f9a4e091e164 /sys/dev/ral | |
| parent | 14fb6b8fe2dca7d3736d431ace232306e5afed31 (diff) | |
Notes
Diffstat (limited to 'sys/dev/ral')
| -rw-r--r-- | sys/dev/ral/rt2560.c | 6 | ||||
| -rw-r--r-- | sys/dev/ral/rt2661.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c index d799be4130914..b3bb76ad623ab 100644 --- a/sys/dev/ral/rt2560.c +++ b/sys/dev/ral/rt2560.c @@ -2005,6 +2005,11 @@ rt2560_start(struct ifnet *ifp) ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; } + /* + * 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)))) @@ -2057,6 +2062,7 @@ rt2560_start(struct ifnet *ifp) } sc->sc_tx_timer = 5; + ic->ic_lastdata = ticks; callout_reset(&sc->watchdog_ch, hz, rt2560_watchdog, sc); } diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c index fde5738c47e75..b7086f532e7ab 100644 --- a/sys/dev/ral/rt2661.c +++ b/sys/dev/ral/rt2661.c @@ -1766,6 +1766,11 @@ rt2661_start(struct ifnet *ifp) IFQ_DRV_DEQUEUE(&ifp->if_snd, m0); if (m0 == NULL) break; + /* + * 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)))) @@ -1819,6 +1824,7 @@ rt2661_start(struct ifnet *ifp) } sc->sc_tx_timer = 5; + ic->ic_lastdata = ticks; callout_reset(&sc->watchdog_ch, hz, rt2661_watchdog, sc); } |