From 28e83f1fe4681e5178616898763aff20f2de25f0 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 16 Mar 2010 15:02:35 -0400
Subject: [PATCH] --- yaml --- r: 193758 b: refs/heads/master c:
 819386dfc67e770b4a0b59983f7948f8ddaa357e h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/ibss.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 832f3fe8f6ea..6ecc2a2a619b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf18723d50206a0b485e438f14c22faf91a3908f
+refs/heads/master: 819386dfc67e770b4a0b59983f7948f8ddaa357e
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index b840d9072de9..f3e942486749 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -276,8 +276,6 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 				    (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 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 		       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);
 	}