Merge formatting changes from DFS branch

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3817 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2008-07-24 00:38:37 +00:00
parent 01eddadfb7
commit 06b49134e4

View File

@ -346,7 +346,8 @@ pick_sample_ndx(struct sample_node *sn, int size_bin)
continue;
/* rarely sample bit-rates that fail a lot */
if (time_before(jiffies, sn->stats[size_bin][ndx].last_tx + ((HZ * STALE_FAILURE_TIMEOUT_MS) / 1000)) &&
if (time_before(jiffies, sn->stats[size_bin][ndx].last_tx +
((HZ * STALE_FAILURE_TIMEOUT_MS) / 1000)) &&
sn->stats[size_bin][ndx].successive_failures > 3)
continue;
@ -449,8 +450,9 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
} else if (sn->packets_sent[size_bin] < 20) {
/* let the bit-rate switch quickly during the first few packets */
change_rates = 1;
} else if (time_after(jiffies, sn->jiffies_since_switch[size_bin] +
((HZ * MIN_SWITCH_MS) / 1000))) {
} else if (time_after(jiffies,
sn->jiffies_since_switch[size_bin] +
((HZ * MIN_SWITCH_MS) / 1000))) {
/* 2 seconds have gone by */
change_rates = 1;
} else if (average_tx_time * 2 < sn->stats[size_bin][sn->current_rate[size_bin]].average_tx_time) {