1 files changed, 8 insertions, 3 deletions

diff --git a/net/mac80211/ieee80211_iface.c b/net/mac80211/ieee80211_iface.c
index b0f17a2b1a42..98b22736e883 100644
--- a/net/mac80211/ieee80211_iface.c
+++ b/net/mac80211/ieee80211_iface.c
@@ -240,16 +240,21 @@ void ieee80211_if_reinit(struct net_device *dev)
                 break;
         }
         case IEEE80211_IF_TYPE_WDS:
+                rcu_read_lock();
                 sta = sta_info_get(local, sdata->u.wds.remote_addr);
                 if (sta) {
-                        sta_info_free(sta);
-                        sta_info_put(sta);
+                        sta_info_unlink(&sta);
                 } else {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
                         printk(KERN_DEBUG "%s: Someone had deleted my STA "
                                "entry for the WDS link\n", dev->name);
 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
                 }
+                rcu_read_unlock();
+                if (sta) {
+                        synchronize_rcu();
+                        sta_info_destroy(sta);
+                }
                 break;
         case IEEE80211_IF_TYPE_MESH_POINT:
         case IEEE80211_IF_TYPE_STA:
@@ -275,7 +280,7 @@ void ieee80211_if_reinit(struct net_device *dev)
         }
 
         /* remove all STAs that are bound to this virtual interface */
-        sta_info_flush(local, dev);
+        sta_info_flush(local, sdata);
 
         memset(&sdata->u, 0, sizeof(sdata->u));
         ieee80211_if_sdata_init(sdata);