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

Merge whitespace changes made on the DFS branch 

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2869 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2007-11-20 18:19:55 +00:00
parent cf73167868
commit 6b697f9589
4 changed files with 202 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

374
ath/if_ath.c
View File

File diff suppressed because it is too large Load Diff

4
net80211/ieee80211_beacon.c
View File

@ -309,7 +309,7 @@ ieee80211_beacon_update(struct ieee80211_node *ni,
/* NB: ic_bsschan is in the DSPARMS beacon IE, so must set this /* NB: ic_bsschan is in the DSPARMS beacon IE, so must set this
* prior to the beacon re-init, below. */ * prior to the beacon re-init, below. */
if (c == NULL) { if (c == NULL) {
/* Requested channel invalid; drop the channel switch /* Requested channel invalid; drop the channel switch
* announcement and do nothing. */ * announcement and do nothing. */
IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH, IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
"%s: find channel failure\n", __func__); "%s: find channel failure\n", __func__);
@ -326,7 +326,7 @@ ieee80211_beacon_update(struct ieee80211_node *ni,
vap->iv_flags &= ~IEEE80211_F_CHANSWITCH; vap->iv_flags &= ~IEEE80211_F_CHANSWITCH;
ic->ic_flags &= ~IEEE80211_F_CHANSWITCH; ic->ic_flags &= ~IEEE80211_F_CHANSWITCH;
/* NB: Only for the first VAP to get here, and when we have a /* NB: Only for the first VAP to get here, and when we have a
* valid channel to which to change. */ * valid channel to which to change. */
if (c && (ic->ic_curchan != c)) { if (c && (ic->ic_curchan != c)) {
ic->ic_curchan = c; ic->ic_curchan = c;

24
net80211/ieee80211_proto.c
View File

@ -1457,41 +1457,41 @@ __ieee80211_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int
/* In WDS mode, allocate and initialize peer node. */ /* In WDS mode, allocate and initialize peer node. */
if (vap->iv_opmode == IEEE80211_M_WDS) { if (vap->iv_opmode == IEEE80211_M_WDS) {
/* XXX: This is horribly non-atomic. */ /* XXX: This is horribly non-atomic. */
struct ieee80211_node *wds_ni = struct ieee80211_node *wds_ni =
ieee80211_find_node(&ic->ic_sta, ieee80211_find_node(&ic->ic_sta,
vap->wds_mac); vap->wds_mac);
if (wds_ni == NULL) { if (wds_ni == NULL) {
wds_ni = ieee80211_alloc_node_table( wds_ni = ieee80211_alloc_node_table(
vap, vap,
vap->wds_mac); vap->wds_mac);
if (wds_ni != NULL) if (wds_ni != NULL)
ieee80211_add_wds_addr( ieee80211_add_wds_addr(
&ic->ic_sta, &ic->ic_sta,
wds_ni, wds_ni,
vap->wds_mac, vap->wds_mac,
1); 1);
else else
IEEE80211_DPRINTF( IEEE80211_DPRINTF(
vap, vap,
IEEE80211_MSG_NODE, IEEE80211_MSG_NODE,
"%s: Unable to " "%s: Unable to "
"allocate node for " "allocate node for "
"WDS: %s\n", "WDS: %s\n",
__func__, __func__,
ether_sprintf( ether_sprintf(
vap->wds_mac) vap->wds_mac)
); );
} }
if (wds_ni != NULL) { if (wds_ni != NULL) {
ieee80211_node_authorize(wds_ni); ieee80211_node_authorize(wds_ni);
wds_ni->ni_chan = wds_ni->ni_chan =
vap->iv_bss->ni_chan; vap->iv_bss->ni_chan;
wds_ni->ni_capinfo = wds_ni->ni_capinfo =
ni->ni_capinfo; ni->ni_capinfo;
wds_ni->ni_associd = 1; wds_ni->ni_associd = 1;
wds_ni->ni_ath_flags = wds_ni->ni_ath_flags =
vap->iv_ath_cap; vap->iv_ath_cap;
} }
} }

2
net80211/ieee80211_scan.c
View File

@ -995,7 +995,7 @@ ieee80211_scan_dfs_action(struct ieee80211vap *vap,
int chanStart, n = 0; int chanStart, n = 0;
u_int32_t curChanFlags; u_int32_t curChanFlags;
/* Only pick a random channel if we're in RUN state. In scan /* Only pick a random channel if we're in RUN state. In scan
* state, we don't need to pick a channel * state, we don't need to pick a channel
*/ */
if (vap->iv_state == IEEE80211_S_RUN) { if (vap->iv_state == IEEE80211_S_RUN) {