mirrors
/
madwifi
mirror of https://github.com/proski/madwifi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove trailing whitespace where it's not in madwifi-dfs branch 

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3783 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2008-07-17 03:44:41 +00:00
parent e74121f314
commit da7fdf05c1
11 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc
View File

@ -145,7 +145,7 @@ ATH_RATE= $(TOP)/ath_rate
#
# Path to the userspace utilities.
#
TOOLS= $(TOP)/tools
TOOLS= $(TOP)/tools
WARNINGS = -Werror -Wall
COPTS+= $(WARNINGS)

42
ath/if_ath.c
View File

@ -306,9 +306,9 @@ static inline int ath_chan_unavail(struct ath_softc *sc);
_ath_cac_running_dbgmsg((_sc), __func__)
#define ath_chan_unavail_dbgmsg(_sc) \
_ath_chan_unavail_dbgmsg((_sc), __func__)
static inline int _ath_cac_running_dbgmsg(struct ath_softc *sc,
static inline int _ath_cac_running_dbgmsg(struct ath_softc *sc,
const char *func);
static inline int _ath_chan_unavail_dbgmsg(struct ath_softc *sc,
static inline int _ath_chan_unavail_dbgmsg(struct ath_softc *sc,
const char *func);
/* 802.11h DFS testing functions */
@ -1689,8 +1689,8 @@ static HAL_BOOL ath_hw_reset(struct ath_softc *sc, HAL_OPMODE opmode,
* unavailable. */
static int
ath_chan_unavail(struct ath_softc *sc) {
return sc->sc_dfs_cac ||
((sc->sc_curchan.privFlags & CHANNEL_DFS) &&
return sc->sc_dfs_cac ||
((sc->sc_curchan.privFlags & CHANNEL_DFS) &&
(sc->sc_curchan.privFlags & CHANNEL_INTERFERENCE));
}
@ -4900,7 +4900,7 @@ ath_beacon_generate(struct ath_softc *sc, struct ieee80211vap *vap, int *needmar
}
if (ath_chan_unavail_dbgmsg(sc)) {
DPRINTF(sc, ATH_DEBUG_BEACON_PROC,
DPRINTF(sc, ATH_DEBUG_BEACON_PROC,
"Skipping VAP when DFS requires radio silence\n");
return NULL;
}
@ -5394,7 +5394,7 @@ ath_beacon_config(struct ath_softc *sc, struct ieee80211vap *vap)
* of the current TSF. Otherwise, we use the
* next beacon timestamp again */
nexttbtt = roundup(hw_tsftu + FUDGE, intval);
}
}
else if (ic->ic_opmode == IEEE80211_M_IBSS) {
if (tsf > hw_tsf) {
/* We received a beacon, but the HW TSF has
@ -5407,7 +5407,7 @@ ath_beacon_config(struct ath_softc *sc, struct ieee80211vap *vap)
/* Normal case: we received a beacon to which
* we have synchronized. Make sure that nexttbtt
* is at least FUDGE TU ahead of hw_tsf */
nexttbtt = tsftu + roundup(hw_tsftu + FUDGE -
nexttbtt = tsftu + roundup(hw_tsftu + FUDGE -
tsftu, intval);
}
}
@ -5431,10 +5431,10 @@ ath_beacon_config(struct ath_softc *sc, struct ieee80211vap *vap)
cfpperiod = 1; /* NB: no PCF support yet */
cfpcount = 0;
/* Pull nexttbtt forward to reflect the current TSF
/* Pull nexttbtt forward to reflect the current TSF
* and calculate DTIM + CFP state for the result. */
n = howmany(hw_tsftu + FUDGE - tsftu, intval);
nexttbtt = tsftu + (n * intval);
nexttbtt = tsftu + (n * intval);
dtimcount = (dtimcount + n) % dtimperiod;
cfpcount = (cfpcount + (n / dtimperiod)) % cfpperiod;
@ -5917,7 +5917,7 @@ ath_node_move_data(const struct ieee80211_node *ni)
else
bf = STAILQ_FIRST(&txq->axq_q);
if (bf) {
ath_hal_puttxbuf(ah, txq->axq_qnum,
ath_hal_puttxbuf(ah, txq->axq_qnum,
bf->bf_daddr);
ath_hal_txstart(ah, txq->axq_qnum);
}
@ -6265,9 +6265,9 @@ ath_recv_mgmt(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
case IEEE80211_FC0_SUBTYPE_BEACON:
/* Update beacon RSSI statistics, (apply to "pure" STA only)
* AND only for our AP's beacons */
if (vap->iv_opmode == IEEE80211_M_STA &&
sc->sc_ic.ic_opmode == IEEE80211_M_STA &&
ni == vap->iv_bss)
if (vap->iv_opmode == IEEE80211_M_STA &&
sc->sc_ic.ic_opmode == IEEE80211_M_STA &&
ni == vap->iv_bss)
ATH_RSSI_LPF(sc->sc_halstats.ns_avgbrssi, rssi);
if ((sc->sc_syncbeacon ||
(vap->iv_flags_ext & IEEE80211_FEXT_APPIE_UPDATE)) &&
@ -8188,7 +8188,7 @@ ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
* (bits 25-10 of the TSF). */
#define TSTAMP_TX_MASK ((2 ^ (27 - 1)) - 1) /* First 27 bits. */
tstamp = ts->ts_tstamp << 10;
tstamp = ts->ts_tstamp << 10;
bf->bf_tsf = ((bf->bf_tsf & ~TSTAMP_TX_MASK) | tstamp);
if ((bf->bf_tsf & TSTAMP_TX_MASK) < tstamp)
bf->bf_tsf -= TSTAMP_TX_MASK + 1;
@ -8620,9 +8620,9 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
doth_cac_needed = IEEE80211_IS_MODE_DFS_MASTER(ic->ic_opmode) &&
(hchan.channel != sc->sc_curchan.channel ||
/* the scan wasn't already done */
(0 == (sc->sc_curchan.privFlags & CHANNEL_DFS_CLEAR))) &&
(0 == (sc->sc_curchan.privFlags & CHANNEL_DFS_CLEAR))) &&
/* the new channel requires DFS protection */
ath_radar_is_dfs_required(sc, &hchan) &&
ath_radar_is_dfs_required(sc, &hchan) &&
(ic->ic_flags & IEEE80211_F_DOTH);
channel_change_required = hchan.channel != sc->sc_curchan.channel ||
@ -8689,7 +8689,7 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
sc->sc_curchan.channelFlags),
tv.tv_sec, tv.tv_usec);
/* set the timeout to normal */
dev->watchdog_timeo = 120 * HZ;
dev->watchdog_timeo = 120 * HZ;
/* Disable beacons and beacon miss interrupts */
sc->sc_dfs_cac = 1;
sc->sc_beacons = 0;
@ -9127,7 +9127,7 @@ ath_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
/* if it is a DFS channel and has not been checked for radar
* do not let the 80211 state machine to go to RUN state. */
if (sc->sc_dfs_cac &&
if (sc->sc_dfs_cac &&
IEEE80211_IS_MODE_DFS_MASTER(vap->iv_opmode)) {
DPRINTF(sc, ATH_DEBUG_STATE | ATH_DEBUG_DOTH,
"VAP -> DFSWAIT_PENDING \n");
@ -9228,7 +9228,7 @@ ath_dfs_cac_completed(unsigned long data )
DPRINTF(sc, ATH_DEBUG_STATE | ATH_DEBUG_DOTH,
"DFS wait %s! - Channel: %u Time: "
"%ld.%06ld\n",
(sc->sc_curchan.privFlags & CHANNEL_DFS) ?
(sc->sc_curchan.privFlags & CHANNEL_DFS) ?
"completed" : "not applicable",
ieee80211_mhz2ieee(sc->sc_curchan.channel,
sc->sc_curchan.channelFlags),
@ -9648,10 +9648,10 @@ ath_getchannels(struct net_device *dev, u_int cc,
(c->channelFlags & CHANNEL_CW_INT ?
" CF_CW_INTERFERENCE" : ""),
/* undocumented */
(c->channelFlags & 0x0004 ?
(c->channelFlags & 0x0004 ?
" CF & (1 << 2)" : ""),
/* undocumented */
(c->channelFlags & 0x0008 ?
(c->channelFlags & 0x0008 ?
" CF & (1 << 3)" : ""),
/* Turbo channel */
(c->channelFlags & CHANNEL_TURBO ?

36
ath/if_ath_radar.c
View File

@ -236,9 +236,9 @@ int ath_radar_update(struct ath_softc *sc)
/* Update the DFS flags (as a sanity check) */
if (ath_radar_correct_dfs_flags(sc, &sc->sc_curchan))
DPRINTF(sc, ATH_DEBUG_DOTH, "%s: %s: channel required "
"corrections to private flags.\n",
"corrections to private flags.\n",
SC_DEV_NAME(sc), __func__);
required = ath_radar_is_dfs_required(sc, &sc->sc_curchan) &&
required = ath_radar_is_dfs_required(sc, &sc->sc_curchan) &&
(ic->ic_flags & IEEE80211_F_DOTH);
/* configure radar pulse detector register using default values, but do
* not toggle the enable bit. XXX: allow tweaking?? */
@ -260,7 +260,7 @@ int ath_radar_update(struct ath_softc *sc)
if (required) {
new_radar |= AR5K_PHY_RADAR_ENABLE;
new_filter |= AR5K_AR5212_PHY_ERR_FIL_RADAR;
new_rxfilt |= (HAL_RX_FILTER_PHYERR |
new_rxfilt |= (HAL_RX_FILTER_PHYERR |
HAL_RX_FILTER_PHYRADAR);
new_mask |= HAL_INT_RXPHY;
new_ier |= HAL_INT_RXPHY;
@ -287,7 +287,7 @@ int ath_radar_update(struct ath_softc *sc)
(old_mask != new_mask) ||
(old_ier != new_ier))) {
DPRINTF(sc, ATH_DEBUG_DOTH,
"%s: %s: Radar detection %s.\n", SC_DEV_NAME(sc),
"%s: %s: Radar detection %s.\n", SC_DEV_NAME(sc),
__func__, required ? "enabled" : "disabled");
}
ath_hal_intrset(ah, new_ier);
@ -309,7 +309,7 @@ int ath_radar_correct_dfs_flags(struct ath_softc *sc, HAL_CHANNEL *hchan)
hchan->channelFlags &= ~CHANNEL_PASSIVE;
hchan->privFlags &= ~CHANNEL_DFS;
}
return ((old_privFlags != hchan->privFlags) ||
return ((old_privFlags != hchan->privFlags) ||
(old_channelFlags != hchan->channelFlags));
}
@ -848,7 +848,7 @@ static HAL_BOOL rp_analyze_short_pulse(
DPRINTF(sc, ATH_DEBUG_DOTHFILTVBSE,
"%s: %s skipped (last pulse isn't old enough to"
" match this pattern). %10llu >= %10llu.\n",
SC_DEV_NAME(sc), pattern->name,
SC_DEV_NAME(sc), pattern->name,
(u_int64_t)(
pattern->min_rep_int *
pattern->min_evts),
@ -924,7 +924,7 @@ static HAL_BOOL rp_analyze_short_pulse(
"%s: %s matching stopped (pulse->rp_tsf"
" < t0_max). t1=%10llu t0_max=%10llu "
"t_min=%10llu t_max=%10llu matched=%u "
"missed=%u\n", SC_DEV_NAME(sc),
"missed=%u\n", SC_DEV_NAME(sc),
pattern->name, t1, t0_max,
t_min, t_max, matched, missed);
break;
@ -937,7 +937,7 @@ static HAL_BOOL rp_analyze_short_pulse(
"%s: %s matching stopped (too many "
"consecutive pulses missing). %d>%d "
"matched=%u. missed=%u.\n",
SC_DEV_NAME(sc), pattern->name,
SC_DEV_NAME(sc), pattern->name,
partial_miss,
pattern->max_consecutive_missing,
matched, missed);
@ -990,7 +990,7 @@ static HAL_BOOL rp_analyze_short_pulse(
"%s: %s mean period deviated "
"from original range [period: "
"%4u, range: %4u-%4u]\n",
SC_DEV_NAME(sc),
SC_DEV_NAME(sc),
pattern->name,
mean_period,
pattern->min_rep_int,
@ -1046,7 +1046,7 @@ static HAL_BOOL rp_analyze_short_pulse(
"many total pulses missing). "
"%d>%d matched=%u. missed=%u."
"\n",
SC_DEV_NAME(sc),
SC_DEV_NAME(sc),
pattern->name,
missed,
pattern->max_missing,
@ -1169,7 +1169,7 @@ static HAL_BOOL rp_analyze_short_pulse(
"%s: %s match not better than best so "
"far. cr: %d matched: %d missed: "
"%d min_evts: %d\n",
SC_DEV_NAME(sc),
SC_DEV_NAME(sc),
pattern->name,
compare_result,
matched,
@ -1444,13 +1444,13 @@ static HAL_BOOL rp_analyze(struct ath_softc *sc)
#endif /* #ifdef ATH_RADAR_LONG_PULSE */
if (DFLAG_ISSET(sc, ATH_DEBUG_DOTHFILT)) {
DPRINTF(sc, ATH_DEBUG_DOTHFILT,
"%s: ========================================\n",
"%s: ========================================\n",
DEV_NAME(sc->sc_dev));
DPRINTF(sc, ATH_DEBUG_DOTHFILT,
"%s: ==BEGIN RADAR SAMPLE====================\n",
"%s: ==BEGIN RADAR SAMPLE====================\n",
DEV_NAME(sc->sc_dev));
DPRINTF(sc, ATH_DEBUG_DOTHFILT,
"%s: ========================================\n",
"%s: ========================================\n",
DEV_NAME(sc->sc_dev));
#ifdef ATH_RADAR_LONG_PULSE
@ -1489,13 +1489,13 @@ static HAL_BOOL rp_analyze(struct ath_softc *sc)
ath_rp_print(sc, 0 /* analyzed pulses only */ );
DPRINTF(sc, ATH_DEBUG_DOTHFILT,
"%s: ========================================\n",
"%s: ========================================\n",
DEV_NAME(sc->sc_dev));
DPRINTF(sc, ATH_DEBUG_DOTHFILT,
"%s: ==END RADAR SAMPLE======================\n",
"%s: ==END RADAR SAMPLE======================\n",
DEV_NAME(sc->sc_dev));
DPRINTF(sc, ATH_DEBUG_DOTHFILT,
"%s: ========================================\n",
"%s: ========================================\n",
DEV_NAME(sc->sc_dev));
}
#ifdef ATH_RADAR_LONG_PULSE
@ -1618,7 +1618,7 @@ void ath_rp_record(struct ath_softc *sc, u_int64_t tsf, u_int8_t rssi,
DPRINTF(sc, ATH_DEBUG_DOTHFILT,
"%s: %s: tsf jitter/bug detected: tsf =%10llu, "
"rptsf =%10llu, rp_tsf - tsf = %10llu\n",
SC_DEV_NAME(sc), __func__, tsf, pulse->rp_tsf,
SC_DEV_NAME(sc), __func__, tsf, pulse->rp_tsf,
pulse->rp_tsf - tsf);
}
}

62
ath_rate/minstrel/minstrel.c
View File

@ -257,7 +257,7 @@ calc_usecs_unicast_packet(struct ath_softc *sc, int length,
if (!rt->info[cix].rateKbps) {
#if 0
printk(KERN_WARNING
printk(KERN_WARNING
"cix %d (%d) bad ratekbps %d mode %u\n",
cix, rt->info[cix].dot11Rate,
rt->info[cix].rateKbps,
@ -309,7 +309,7 @@ ath_rate_node_copy(struct ath_softc *sc,
struct ath_node *dst, const struct ath_node *src)
{
struct minstrel_node *odst = ATH_NODE_MINSTREL(dst);
const struct minstrel_node *osrc =
const struct minstrel_node *osrc =
(const struct minstrel_node *)&src[1];
memcpy(odst, osrc, sizeof(struct minstrel_node));
}
@ -332,8 +332,8 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
return;
}
mrr = sc->sc_mrretry &&
!(ic->ic_flags & IEEE80211_F_USEPROT) &&
mrr = sc->sc_mrretry &&
!(ic->ic_flags & IEEE80211_F_USEPROT) &&
ENABLE_MRR;
if (sn->static_rate_ndx >= 0) {
@ -343,8 +343,8 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
sn->random_n = (sn->a * sn->random_n) + sn->b;
offset = sn->random_n & 0xf;
if ((((100 * sn->sample_count) / sn->packet_count) <
ath_lookaround_rate) &&
if ((((100 * sn->sample_count) / sn->packet_count) <
ath_lookaround_rate) &&
(offset < 2)) {
sn->sample_count++;
sn->is_sampling = 1;
@ -373,7 +373,7 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
}
sn->rs_sample_rate = ndx;
sn->rs_sample_rate_slower =
(sn->perfect_tx_time[ndx] >
(sn->perfect_tx_time[ndx] >
sn->perfect_tx_time[sn->max_tp_rate]);
if (sn->rs_sample_rate_slower)
ndx = sn->max_tp_rate;
@ -408,7 +408,7 @@ ath_rate_get_mrr(struct ath_softc *sc, struct ath_node *an, int shortPreamble,
int rc1, rc2, rc3;
if (sn->num_rates <= 0) {
DPRINTF(sc, "%s: no rates for " MAC_FMT "\n",
DPRINTF(sc, "%s: no rates for " MAC_FMT "\n",
dev_info,
MAC_ADDR(an->an_node.ni_macaddr));
memset(mrr, 0, sizeof(struct ieee80211_mrr));
@ -503,8 +503,8 @@ ath_rate_tx_complete(struct ath_softc *sc,
if (!ts->ts_status) /* Success when sending a packet*/
sn->rs_ratesuccess[final_ndx]++;
mrr = sc->sc_mrretry &&
!(ic->ic_flags & IEEE80211_F_USEPROT) &&
mrr = sc->sc_mrretry &&
!(ic->ic_flags & IEEE80211_F_USEPROT) &&
ENABLE_MRR;
if (!mrr) {
@ -515,10 +515,10 @@ ath_rate_tx_complete(struct ath_softc *sc,
return;
}
/* Now, query the HAL/hardware to find out the contents of the
* multirate retry chain. If we have it set to 6, 3, 2, 2, this
/* Now, query the HAL/hardware to find out the contents of the
* multirate retry chain. If we have it set to 6, 3, 2, 2, this
* call will always return 6,3,2,2. For some packets, we can
* get a mrr of 0, -1, -1, -1, which indicates there is no
* get a mrr of 0, -1, -1, -1, which indicates there is no
* chain installed for that packet */
rate0 = sc->sc_hwmap[MS(ds->ds_ctl3, AR_XmitRate0)].ieeerate;
tries0 = MS(ds->ds_ctl2, AR_XmitDataTries0);
@ -686,9 +686,9 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni)
* the node. We know the rate is there because the
* rate set is checked when the station associates. */
/* NB: the rate set is assumed to be sorted. */
for (;
(srate >= 0) &&
(ni->ni_rates.rs_rates[srate] &
for (;
(srate >= 0) &&
(ni->ni_rates.rs_rates[srate] &
IEEE80211_RATE_VAL) != vap->iv_fixed_rate;
srate--);
@ -727,7 +727,7 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni)
sn->retry_adjusted_count[x] = 1;
for (retry_index = 2; retry_index < ATH_TXMAXTRY; retry_index++) {
tx_time = calc_usecs_unicast_packet(sc, 1200,
tx_time = calc_usecs_unicast_packet(sc, 1200,
sn->rates[x].rix, 0, retry_index);
if (tx_time > ath_segment_size)
break;
@ -739,7 +739,7 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni)
#if 0
DPRINTF(sc, "%s: Retry table for this node\n", __func__);
for (x = 0; x < ni->ni_rates.rs_nrates; x++)
DPRINTF(sc, "%2d %2d %6d \n", x, sn->retry_count[x],
DPRINTF(sc, "%2d %2d %6d \n", x, sn->retry_count[x],
sn->perfect_tx_time[x]);
#endif
@ -766,12 +766,12 @@ ath_rate_newstate(struct ieee80211vap *vap, enum ieee80211_state newstate)
if (newstate == IEEE80211_S_RUN) {
if (ic->ic_opmode != IEEE80211_M_STA) {
/* Sync rates for associated stations and
/* Sync rates for associated stations and
* neighbors. */
ieee80211_iterate_nodes(&ic->ic_sta,
ieee80211_iterate_nodes(&ic->ic_sta,
ath_rate_cb, NULL);
}
ath_rate_newassoc(ic->ic_dev->priv,
ath_rate_newassoc(ic->ic_dev->priv,
ATH_NODE(vap->iv_bss), 1);
}
}
@ -807,7 +807,7 @@ ath_timer_function(unsigned long data)
ath_rate_statistics(sc, tmpvap->iv_bss);
}
} else
ieee80211_iterate_nodes(&ic->ic_sta,
ieee80211_iterate_nodes(&ic->ic_sta,
ath_rate_statistics, sc);
}
@ -841,12 +841,12 @@ ath_rate_statistics(void *arg, struct ieee80211_node *ni)
micro_secs = ONE_SECOND;
if (rn->rs_rateattempts[i] != 0) {
p = (rn->rs_ratesuccess[i] * 18000) /
p = (rn->rs_ratesuccess[i] * 18000) /
rn->rs_rateattempts[i];
rn->rs_succ_hist[i] += rn->rs_ratesuccess[i];
rn->rs_att_hist[i] += rn->rs_rateattempts[i];
rn->rs_thisprob[i] = p;
p = ((p * (100 - ath_ewma_level)) +
p = ((p * (100 - ath_ewma_level)) +
(rn->rs_probability[i] * ath_ewma_level)) / 100;
rn->rs_probability[i] = p;
rn->rs_this_tp[i] = p * (ONE_SECOND / micro_secs);
@ -861,9 +861,9 @@ ath_rate_statistics(void *arg, struct ieee80211_node *ni)
/* Sample less often below the 10% chance of success.
* Sample less often above the 95% chance of success.
* 'rn->rs_probability' has a scale of 0 (0%) to 18000 (100%),
* 'rn->rs_probability' has a scale of 0 (0%) to 18000 (100%),
* which avoids rounding issues.*/
if ((rn->rs_probability[i] > 17100) ||
if ((rn->rs_probability[i] > 17100) ||
(rn->rs_probability[i] < 1800)) {
rn->retry_adjusted_count[i] = rn->retry_count[i] >> 1;
if (rn->retry_adjusted_count[i] > 2)
@ -967,8 +967,8 @@ ath_proc_read_nodes(struct ieee80211vap *vap, char *buf, int space)
/* Assume each node needs 1500 bytes */
if ((buf + space) < (p + 1500)) {
if ((buf + space) > (p + 100)) {
p += sprintf(p, "out of room for node "
MAC_FMT "\n\n",
p += sprintf(p, "out of room for node "
MAC_FMT "\n\n",
MAC_ADDR(ni->ni_macaddr));
break;
}
@ -981,7 +981,7 @@ ath_proc_read_nodes(struct ieee80211vap *vap, char *buf, int space)
if (IEEE80211_ADDR_EQ(vap->iv_myaddr, ni->ni_macaddr))
continue;
p += sprintf(p, "rate data for node: " MAC_FMT "\n",
p += sprintf(p, "rate data for node: " MAC_FMT "\n",
MAC_ADDR(ni->ni_macaddr));
p += sprintf(p, " rate throughput EWMA prob this prob this "
"succ/attempt success attempts\n");
@ -997,7 +997,7 @@ ath_proc_read_nodes(struct ieee80211vap *vap, char *buf, int space)
p += sprintf(p, " %2u%s",
odst->rates[x].rate / 2,
(odst->rates[x].rate & 0x1) != 0 ?
(odst->rates[x].rate & 0x1) != 0 ?
".5" : " ");
this_tp = ((odst->rs_this_tp[x] / 18000) * 96) >> 10;
@ -1016,7 +1016,7 @@ ath_proc_read_nodes(struct ieee80211vap *vap, char *buf, int space)
p += sprintf(p, "\n");
p += sprintf(p, "Total packet count:: ideal %d "
"lookaround %d\n\n",
"lookaround %d\n\n",
odst->packet_count, odst->sample_count);
}
IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);

2
ath_rate/sample/sample.c
View File

@ -449,7 +449,7 @@ 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] +
} else if (time_after(jiffies, sn->jiffies_since_switch[size_bin] +
((HZ * MIN_SWITCH_MS) / 1000))) {
/* 2 seconds have gone by */
change_rates = 1;

22
net80211/ieee80211.c
View File

@ -846,12 +846,12 @@ ieee80211_dfs_action(struct ieee80211com *ic) {
* vap to RUN. */
}
/* Check the scan results using only cached results */
if (!(ieee80211_check_scan(vap, IEEE80211_SCAN_NOSSID |
IEEE80211_SCAN_KEEPMODE |
if (!(ieee80211_check_scan(vap, IEEE80211_SCAN_NOSSID |
IEEE80211_SCAN_KEEPMODE |
IEEE80211_SCAN_USECACHE, 0,
vap->iv_des_nssid, vap->iv_des_ssid,
ieee80211_scan_dfs_action))) {
/* No channel was found, so call the scan action with no
/* No channel was found, so call the scan action with no
* result. */
ieee80211_scan_dfs_action(vap, NULL);
}
@ -961,7 +961,7 @@ ieee80211_expire_dfs_excl_timer(unsigned long data)
/* Operating on channel other than desired. */
(vap->iv_des_chan != IEEE80211_CHAN_ANYC) &&
(vap->iv_des_chan->ic_freq > 0) &&
(vap->iv_des_chan->ic_freq !=
(vap->iv_des_chan->ic_freq !=
ic->ic_bsschan->ic_freq)) {
struct ieee80211_channel *des_chan =
ieee80211_find_channel(ic,
@ -980,7 +980,7 @@ ieee80211_expire_dfs_excl_timer(unsigned long data)
ic_freq,
vap->iv_des_chan->
ic_flags);
} else if (!(des_chan->ic_flags &
} else if (!(des_chan->ic_flags &
IEEE80211_CHAN_RADAR)) {
IEEE80211_DPRINTF(vap,
IEEE80211_MSG_DOTH,
@ -992,9 +992,9 @@ ieee80211_expire_dfs_excl_timer(unsigned long data)
ic_freq,
vap->iv_des_chan->
ic_flags);
ic->ic_chanchange_chan =
ic->ic_chanchange_chan =
des_chan->ic_ieee;
ic->ic_chanchange_tbtt =
ic->ic_chanchange_tbtt =
IEEE80211_RADAR_CHANCHANGE_TBTT_COUNT;
ic->ic_flags |= IEEE80211_F_CHANSWITCH;
} else if (ieee80211_msg_is_reported(vap,
@ -1097,7 +1097,7 @@ ieee80211_mark_dfs(struct ieee80211com *ic, struct ieee80211_channel *ichan)
"(%d, 0x%x)\n",
__func__, ichan->ic_freq,
ichan->ic_flags);
/* The current channel has been marked. We
/* The current channel has been marked. We
* need to move away from it. */
ieee80211_dfs_action(ic);
} else
@ -1112,10 +1112,10 @@ ieee80211_mark_dfs(struct ieee80211com *ic, struct ieee80211_channel *ichan)
ic->ic_curchan->ic_ieee,
ic->ic_curchan->ic_freq);
} else {
/* Change to a radar free 11a channel for dfstesttime
/* Change to a radar free 11a channel for dfstesttime
* seconds. */
ic->ic_chanchange_chan = IEEE80211_RADAR_TEST_MUTE_CHAN;
ic->ic_chanchange_tbtt =
ic->ic_chanchange_tbtt =
IEEE80211_RADAR_CHANCHANGE_TBTT_COUNT;
ic->ic_flags |= IEEE80211_F_CHANSWITCH;
if_printf(dev,
@ -1129,7 +1129,7 @@ ieee80211_mark_dfs(struct ieee80211com *ic, struct ieee80211_channel *ichan)
ic->ic_curchan->ic_freq);
}
} else {
/* XXX: Are we in STA mode? If so, send an action msg. to AP
/* XXX: Are we in STA mode? If so, send an action msg. to AP
* saying we found a radar? */
}
}

14
net80211/ieee80211_beacon.c
View File

@ -293,9 +293,9 @@ ieee80211_beacon_update(struct ieee80211_node *ni,
/* Check if we need to change channel right now */
if ((ic->ic_flags & IEEE80211_F_DOTH) &&
(vap->iv_flags & IEEE80211_F_CHANSWITCH)) {
struct ieee80211_channel *c =
struct ieee80211_channel *c =
ieee80211_doth_findchan(vap, ic->ic_chanchange_chan);
if (!vap->iv_chanchange_count && !c) {
vap->iv_flags &= ~IEEE80211_F_CHANSWITCH;
ic->ic_flags &= ~IEEE80211_F_CHANSWITCH;
@ -495,10 +495,10 @@ ieee80211_beacon_update(struct ieee80211_node *ni,
struct ieee80211_ie_csa *csa_ie =
(struct ieee80211_ie_csa *)bo->bo_chanswitch;
IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
"%s: Sending 802.11h chanswitch IE: "
"%d/%d\n", __func__,
ic->ic_chanchange_chan,
"%d/%d\n", __func__,
ic->ic_chanchange_chan,
ic->ic_chanchange_tbtt);
if (!vap->iv_chanchange_count) {
vap->iv_flags |= IEEE80211_F_CHANSWITCH;
@ -525,13 +525,13 @@ ieee80211_beacon_update(struct ieee80211_node *ni,
bo->bo_ath_caps += sizeof(*csa_ie);
bo->bo_xr += sizeof(*csa_ie);
/* indicate new beacon length so other layers
/* indicate new beacon length so other layers
* may manage memory */
skb_put(skb, sizeof(*csa_ie));
len_changed = 1;
} else if (csa_ie->csa_count)
csa_ie->csa_count--;
vap->iv_chanchange_count++;
IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
"%s: CHANSWITCH IE, change in %d TBTT\n",

2
net80211/ieee80211_output.c
View File

@ -685,7 +685,7 @@ ieee80211_skbhdr_adjust(struct ieee80211vap *vap, int hdrsize,
int n = 0;
if (need_headroom > skb_headroom(skb))
n = need_headroom - skb_headroom(skb);
if (pskb_expand_head(skb, n, need_tailroom -
if (pskb_expand_head(skb, n, need_tailroom -
skb_tailroom(skb), GFP_ATOMIC)) {
IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT,
"%s: cannot expand storage (tail)\n", __func__);

22
net80211/ieee80211_scan.c
View File

@ -293,7 +293,7 @@ scan_restart_pwrsav(unsigned long arg)
/* Handle PS stuff, if required. */
ieee80211_sta_pwrsave(vap, 1);
/* Use an initial 1ms delay to ensure the null
* data frame has a chance to go out.
* XXX: 1ms is a lot, better to trigger scan
@ -1019,16 +1019,16 @@ ieee80211_scan_dfs_action(struct ieee80211vap *vap,
* $4.6.2.5.1 */
/* First, we count the usable channels */
count = 0;
curChanFlags = (ic->ic_bsschan->ic_flags) &
curChanFlags = (ic->ic_bsschan->ic_flags) &
~(IEEE80211_CHAN_RADAR);
for (i = 0; i < ic->ic_nchans; i++) {
if ((ic->ic_channels[i].ic_ieee !=
if ((ic->ic_channels[i].ic_ieee !=
ic->ic_bsschan->ic_ieee) &&
(ic->ic_channels[i].ic_flags == curChanFlags)) {
IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
"%s: usable channel %3d "
"(%4d MHz)\n",
__func__,
__func__,
ic->ic_channels[i].ic_ieee,
ic->ic_channels[i].ic_freq);
count ++;
@ -1041,12 +1041,12 @@ ieee80211_scan_dfs_action(struct ieee80211vap *vap,
count = 0;
for (i = 0; i < ic->ic_nchans; i++) {
if ((ic->ic_channels[i].ic_ieee !=
if ((ic->ic_channels[i].ic_ieee !=
ic->ic_bsschan->ic_ieee) &&
(ic->ic_channels[i].ic_flags ==
(ic->ic_channels[i].ic_flags ==
curChanFlags)) {
if (count++ == chanStart) {
new_channel =
new_channel =
&ic->ic_channels[i];
break;
}
@ -1057,8 +1057,8 @@ ieee80211_scan_dfs_action(struct ieee80211vap *vap,
if (new_channel != NULL)
IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
"%s: new random channel found %3d "
"(%4d MHz)\n", __func__,
new_channel->ic_ieee,
"(%4d MHz)\n", __func__,
new_channel->ic_ieee,
new_channel->ic_freq);
}
@ -1066,7 +1066,7 @@ ieee80211_scan_dfs_action(struct ieee80211vap *vap,
/* Search for the first channel with no radar detected */
int n = 0;
for (n = 0; n < ic->ic_nchans; n++) {
if (0 == (ic->ic_channels[n].ic_flags &
if (0 == (ic->ic_channels[n].ic_flags &
IEEE80211_CHAN_RADAR)) {
new_channel = &ic->ic_channels[n];
break;
@ -1087,7 +1087,7 @@ ieee80211_scan_dfs_action(struct ieee80211vap *vap,
new_channel->ic_freq);
ic->ic_chanchange_chan = new_channel->ic_ieee;
ic->ic_chanchange_tbtt =
ic->ic_chanchange_tbtt =
IEEE80211_RADAR_CHANCHANGE_TBTT_COUNT;
ic->ic_flags |= IEEE80211_F_CHANSWITCH;
} else {

6
net80211/ieee80211_wireless.c
View File

@ -764,13 +764,13 @@ ieee80211_ioctl_siwfreq(struct net_device *dev, struct iw_request_info *info,
ic->ic_set_channel(ic);
}
} else if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
/* Need to use channel switch announcement on beacon if we are
* up and running. We use ic_set_channel directly if we are
/* Need to use channel switch announcement on beacon if we are
* up and running. We use ic_set_channel directly if we are
* "running" but not "up". Otherwise, iv_des_chan will take
* effect when we are transitioned to RUN state later. */
if (IS_UP(vap->iv_dev) &&
(0 == (vap->iv_des_chan->ic_flags & CHANNEL_DFS))) {
pre_announced_chanswitch(dev,
pre_announced_chanswitch(dev,
ieee80211_chan2ieee(ic, vap->iv_des_chan),
IEEE80211_DEFAULT_CHANCHANGE_TBTT_COUNT);
}

2
scripts/make-release.bash
View File

@ -163,7 +163,7 @@ while ! ((valid)); do
newversion="$newmajor.$newminor.$newpoint"
newmicro="0"
fi
if [[ "$(svn list $reproot/tags | grep -c ^release-$newversion)" != "0" ]]; then
echo "Release $newversion already exists. Try again."
else