diff options
| author | Damien Bergamini <damien@FreeBSD.org> | 2005-08-20 14:28:37 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@FreeBSD.org> | 2005-08-20 14:28:37 +0000 |
| commit | e0454c269b7e7319186ea9aa849a1c072d26ca3e (patch) | |
| tree | ba2c8430505bc8df06ed18e87fbe8126a782523a /sys/dev/ral | |
| parent | 017261026e01dfab3b82b02803ebe6ea9c8dd923 (diff) | |
Notes
Diffstat (limited to 'sys/dev/ral')
| -rw-r--r-- | sys/dev/ral/if_ral.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/ral/if_ral.c b/sys/dev/ral/if_ral.c index 1b275e97fa55..250a737a1593 100644 --- a/sys/dev/ral/if_ral.c +++ b/sys/dev/ral/if_ral.c @@ -2193,7 +2193,8 @@ ral_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) if (error == ENETRESET) { if ((ifp->if_flags & IFF_UP) && - (ifp->if_drv_flags & IFF_DRV_RUNNING)) + (ifp->if_drv_flags & IFF_DRV_RUNNING) && + (ic->ic_roaming != IEEE80211_ROAMING_MANUAL)) ral_init(sc); error = 0; } @@ -2766,10 +2767,11 @@ ral_init(void *priv) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - if (ic->ic_opmode == IEEE80211_M_MONITOR) + if (ic->ic_opmode != IEEE80211_M_MONITOR) { + if (ic->ic_roaming != IEEE80211_ROAMING_MANUAL) + ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); + } else ieee80211_new_state(ic, IEEE80211_S_RUN, -1); - else - ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); #undef N } |