diff options
| author |   Johannes Berg <johannes@sipsolutions.net> | 2009-02-10 21:26:00 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-02-13 13:45:58 -0500 |
| commit | 00d3f14cf9f12c21428121026a5e1d5f65926447 (patch) | |
| tree | e5f355deef7b9ebb5b3bf65f9d589bd2a1cfbafa /net/mac80211/spectmgmt.c | |
| parent | cfg80211: add more flexible BSS lookup (diff) | |
| download | linux-dev-00d3f14cf9f12c21428121026a5e1d5f65926447.tar.xz linux-dev-00d3f14cf9f12c21428121026a5e1d5f65926447.zip | |
mac80211: use cfg80211s BSS infrastructure
Remove all the code from mac80211 to keep track of BSSes
and use the cfg80211-provided code completely.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/spectmgmt.c')
| -rw-r--r-- | net/mac80211/spectmgmt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/spectmgmt.c b/net/mac80211/spectmgmt.c index 8d4ec2968f8f..47bb2aed2813 100644 --- a/net/mac80211/spectmgmt.c +++ b/net/mac80211/spectmgmt.c @@ -102,8 +102,9 @@ void ieee80211_chswitch_work(struct work_struct *work) goto exit; sdata->local->oper_channel = sdata->local->csa_channel; + /* XXX: shouldn't really modify cfg80211-owned data! */ if (!ieee80211_hw_config(sdata->local, IEEE80211_CONF_CHANGE_CHANNEL)) - bss->freq = sdata->local->oper_channel->center_freq; + bss->cbss.channel = sdata->local->oper_channel; ieee80211_rx_bss_put(sdata->local, bss); exit: @@ -158,7 +159,9 @@ void ieee80211_process_chanswitch(struct ieee80211_sub_if_data *sdata, IEEE80211_QUEUE_STOP_REASON_CSA); ifsta->flags |= IEEE80211_STA_CSA_RECEIVED; mod_timer(&ifsta->chswitch_timer, - jiffies + msecs_to_jiffies(sw_elem->count * bss->beacon_int)); + jiffies + + msecs_to_jiffies(sw_elem->count * + bss->cbss.beacon_interval)); } } |