Merge branch 'topic/asoc' into for-linus

[safe/jmp/linux-2.6] / net / mac80211 / spectmgmt.c

diff --git a/net/mac80211/spectmgmt.c b/net/mac80211/spectmgmt.c
index 8396b5a..5f7a262 100644 (file)
--- a/net/mac80211/spectmgmt.c
+++ b/net/mac80211/spectmgmt.c
@@ -88,26 +88,27 @@ void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,
 void ieee80211_chswitch_work(struct work_struct *work)
 {
        struct ieee80211_sub_if_data *sdata =
-               container_of(work, struct ieee80211_sub_if_data, u.sta.chswitch_work);
+               container_of(work, struct ieee80211_sub_if_data, u.mgd.chswitch_work);
        struct ieee80211_bss *bss;
-       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+       struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
 
        if (!netif_running(sdata->dev))
                return;
 
-       bss = ieee80211_rx_bss_get(sdata->local, ifsta->bssid,
+       bss = ieee80211_rx_bss_get(sdata->local, ifmgd->bssid,
                                   sdata->local->hw.conf.channel->center_freq,
-                                  ifsta->ssid, ifsta->ssid_len);
+                                  ifmgd->ssid, ifmgd->ssid_len);
        if (!bss)
                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:
-       ifsta->flags &= ~IEEE80211_STA_CSA_RECEIVED;
+       ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED;
        ieee80211_wake_queues_by_reason(&sdata->local->hw,
                                        IEEE80211_QUEUE_STOP_REASON_CSA);
 }
@@ -116,9 +117,9 @@ void ieee80211_chswitch_timer(unsigned long data)
 {
        struct ieee80211_sub_if_data *sdata =
                (struct ieee80211_sub_if_data *) data;
-       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+       struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
 
-       queue_work(sdata->local->hw.workqueue, &ifsta->chswitch_work);
+       queue_work(sdata->local->hw.workqueue, &ifmgd->chswitch_work);
 }
 
 void ieee80211_process_chanswitch(struct ieee80211_sub_if_data *sdata,
@@ -126,14 +127,14 @@ void ieee80211_process_chanswitch(struct ieee80211_sub_if_data *sdata,
                                  struct ieee80211_bss *bss)
 {
        struct ieee80211_channel *new_ch;
-       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+       struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        int new_freq = ieee80211_channel_to_frequency(sw_elem->new_ch_num);
 
        /* FIXME: Handle ADHOC later */
        if (sdata->vif.type != NL80211_IFTYPE_STATION)
                return;
 
-       if (ifsta->state != IEEE80211_STA_MLME_ASSOCIATED)
+       if (ifmgd->state != IEEE80211_STA_MLME_ASSOCIATED)
                return;
 
        if (sdata->local->sw_scanning || sdata->local->hw_scanning)
@@ -142,7 +143,7 @@ void ieee80211_process_chanswitch(struct ieee80211_sub_if_data *sdata,
        /* Disregard subsequent beacons if we are already running a timer
           processing a CSA */
 
-       if (ifsta->flags & IEEE80211_STA_CSA_RECEIVED)
+       if (ifmgd->flags & IEEE80211_STA_CSA_RECEIVED)
                return;
 
        new_ch = ieee80211_get_channel(sdata->local->hw.wiphy, new_freq);
@@ -152,12 +153,35 @@ void ieee80211_process_chanswitch(struct ieee80211_sub_if_data *sdata,
        sdata->local->csa_channel = new_ch;
 
        if (sw_elem->count <= 1) {
-               queue_work(sdata->local->hw.workqueue, &ifsta->chswitch_work);
+               queue_work(sdata->local->hw.workqueue, &ifmgd->chswitch_work);
        } else {
                ieee80211_stop_queues_by_reason(&sdata->local->hw,
                                                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));
+               ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;
+               mod_timer(&ifmgd->chswitch_timer,
+                         jiffies +
+                         msecs_to_jiffies(sw_elem->count *
+                                          bss->cbss.beacon_interval));
        }
 }
+
+void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata,
+                                u16 capab_info, u8 *pwr_constr_elem,
+                                u8 pwr_constr_elem_len)
+{
+       struct ieee80211_conf *conf = &sdata->local->hw.conf;
+
+       if (!(capab_info & WLAN_CAPABILITY_SPECTRUM_MGMT))
+               return;
+
+       /* Power constraint IE length should be 1 octet */
+       if (pwr_constr_elem_len != 1)
+               return;
+
+       if ((*pwr_constr_elem <= conf->channel->max_power) &&
+           (*pwr_constr_elem != sdata->local->power_constr_level)) {
+               sdata->local->power_constr_level = *pwr_constr_elem;
+               ieee80211_hw_config(sdata->local, 0);
+       }
+}
+