mac80211: Add 802.11h CSA support

Move to the advertised channel on reception of
a CSA element. This is needed for 802.11h compliance.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 13 insertions, 0 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 2db56605a2b6..cac4f65d9e61 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1629,6 +1629,13 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
         if (!bss)
                 return;
 
+        if (elems->ch_switch_elem && (elems->ch_switch_elem_len == 3) &&
+            (memcmp(mgmt->bssid, sdata->u.sta.bssid, ETH_ALEN) == 0)) {
+                struct ieee80211_channel_sw_ie *sw_elem =
+                        (struct ieee80211_channel_sw_ie *)elems->ch_switch_elem;
+                ieee80211_process_chanswitch(sdata, sw_elem, bss);
+        }
+
         /* was just updated in ieee80211_bss_info_update */
         beacon_timestamp = bss->timestamp;
 
@@ -1765,6 +1772,9 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
             memcmp(ifsta->bssid, mgmt->bssid, ETH_ALEN) != 0)
                 return;
 
+        if (rx_status->freq != local->hw.conf.channel->center_freq)
+                return;
+
         ieee80211_sta_wmm_params(local, ifsta, elems.wmm_param,
                                  elems.wmm_param_len);
 
@@ -2425,8 +2435,11 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
 
         ifsta = &sdata->u.sta;
         INIT_WORK(&ifsta->work, ieee80211_sta_work);
+        INIT_WORK(&ifsta->chswitch_work, ieee80211_chswitch_work);
         setup_timer(&ifsta->timer, ieee80211_sta_timer,
                     (unsigned long) sdata);
+        setup_timer(&ifsta->chswitch_timer, ieee80211_chswitch_timer,
+                    (unsigned long) sdata);
         skb_queue_head_init(&ifsta->skb_queue);
 
         ifsta->capab = WLAN_CAPABILITY_ESS;