Revert "mac80211: fix rates setup on IBSS merge"
I accidentally merged an incomplete version of the patch...
This reverts commit b4d59a9317e41faec3d0b6a03f0454d1e8abb710.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index b840d9072..f3e9424 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -276,8 +276,6 @@
(unsigned long long) sta->sta.supp_rates[band]);
#endif
rcu_read_unlock();
-
- /* FIXME: update rate control */
} else {
rcu_read_unlock();
ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,
@@ -372,7 +370,6 @@
sdata->name, mgmt->bssid);
#endif
ieee80211_sta_join_ibss(sdata, bss);
- supp_rates = ieee80211_sta_get_rates(local, elems, band);
ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,
supp_rates, GFP_KERNEL);
}