mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-22 14:31:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename doth to DFS where madwifi-dfs does it

Browse Source 
git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3797 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2008-07-17 06:44:24 +00:00
parent 4ab91bd2bf
commit 000f685865
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ath/if_ath.c
View File

@ -8577,7 +8577,7 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
struct net_device *dev = sc->sc_dev; struct net_device *dev = sc->sc_dev;
HAL_CHANNEL hchan; HAL_CHANNEL hchan;
u_int8_t tswitch = 0; u_int8_t tswitch = 0;
u_int8_t doth_cac_needed = 0; u_int8_t dfs_cac_needed = 0;
u_int8_t channel_change_required = 0; u_int8_t channel_change_required = 0;
struct timeval tv; struct timeval tv;
@ -8616,8 +8616,8 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
ath_interrupt_dfs_cac(sc, ath_interrupt_dfs_cac(sc,
"Channel change interrupted DFS wait."); "Channel change interrupted DFS wait.");
/* Need a doth channel availability check? We do if ... */ /* Need a DFS channel availability check? We do if ... */
doth_cac_needed = IEEE80211_IS_MODE_DFS_MASTER(ic->ic_opmode) && dfs_cac_needed = IEEE80211_IS_MODE_DFS_MASTER(ic->ic_opmode) &&
(hchan.channel != sc->sc_curchan.channel || (hchan.channel != sc->sc_curchan.channel ||
/* the scan wasn't already done */ /* the scan wasn't already done */
(0 == (sc->sc_curchan.privFlags & CHANNEL_DFS_CLEAR))) && (0 == (sc->sc_curchan.privFlags & CHANNEL_DFS_CLEAR))) &&
@ -8627,7 +8627,7 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
channel_change_required = hchan.channel != sc->sc_curchan.channel || channel_change_required = hchan.channel != sc->sc_curchan.channel ||
hchan.channelFlags != sc->sc_curchan.channelFlags || hchan.channelFlags != sc->sc_curchan.channelFlags ||
tswitch || doth_cac_needed; tswitch || dfs_cac_needed;
if (channel_change_required) { if (channel_change_required) {
HAL_STATUS status; HAL_STATUS status;
@ -8681,7 +8681,7 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
} }
do_gettimeofday(&tv); do_gettimeofday(&tv);
if (doth_cac_needed && !(ic->ic_flags & IEEE80211_F_SCAN)) { if (dfs_cac_needed && !(ic->ic_flags & IEEE80211_F_SCAN)) {
DPRINTF(sc, ATH_DEBUG_STATE | ATH_DEBUG_DOTH, DPRINTF(sc, ATH_DEBUG_STATE | ATH_DEBUG_DOTH,
"Starting DFS wait for " "Starting DFS wait for "
"channel %u -- Time: %ld.%06ld\n", "channel %u -- Time: %ld.%06ld\n",