1 files changed, 29 insertions, 9 deletions

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 35ac38871420..2bf0158c3f82 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -149,6 +149,31 @@ u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata)
         return changed;
 }
 
+/*
+ * mesh_sta_cleanup - clean up any mesh sta state
+ *
+ * @sta: mesh sta to clean up.
+ */
+void mesh_sta_cleanup(struct sta_info *sta)
+{
+        struct ieee80211_sub_if_data *sdata = sta->sdata;
+        u32 changed;
+
+        /*
+         * maybe userspace handles peer allocation and peering, but in either
+         * case the beacon is still generated by the kernel and we might need
+         * an update.
+         */
+        changed = mesh_accept_plinks_update(sdata);
+        if (sdata->u.mesh.security == IEEE80211_MESH_SEC_NONE) {
+                changed |= mesh_plink_deactivate(sta);
+                del_timer_sync(&sta->plink_timer);
+        }
+
+        if (changed)
+                ieee80211_bss_info_change_notify(sdata, changed);
+}
+
 int mesh_rmc_init(struct ieee80211_sub_if_data *sdata)
 {
         int i;
@@ -368,8 +393,6 @@ mesh_add_rsn_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata)
 int mesh_add_ds_params_ie(struct sk_buff *skb,
                           struct ieee80211_sub_if_data *sdata)
 {
-        struct ieee80211_local *local = sdata->local;
-        struct ieee80211_supported_band *sband;
         struct ieee80211_chanctx_conf *chanctx_conf;
         struct ieee80211_channel *chan;
         u8 *pos;
@@ -386,13 +409,10 @@ int mesh_add_ds_params_ie(struct sk_buff *skb,
         chan = chanctx_conf->def.chan;
         rcu_read_unlock();
 
-        sband = local->hw.wiphy->bands[chan->band];
-        if (sband->band == IEEE80211_BAND_2GHZ) {
-                pos = skb_put(skb, 2 + 1);
-                *pos++ = WLAN_EID_DS_PARAMS;
-                *pos++ = 1;
-                *pos++ = ieee80211_frequency_to_channel(chan->center_freq);
-        }
+        pos = skb_put(skb, 2 + 1);
+        *pos++ = WLAN_EID_DS_PARAMS;
+        *pos++ = 1;
+        *pos++ = ieee80211_frequency_to_channel(chan->center_freq);
 
         return 0;
 }