From bac3af5d95821b7dffadfd7cda066246d1bfb90e Mon Sep 17 00:00:00 2001
From: Bruno Randolf <br1@einfach.org>
Date: Wed, 3 Mar 2010 18:45:42 +0900
Subject: [PATCH] --- yaml --- r: 193759 b: refs/heads/master c:
 09a08cff3d13315c948e6aee5cf912f8f1db54e7 h: refs/heads/master i:   193757:
 5dc82827055d6b2d60a28223f5c6c9bcc7419bd8   193755:
 4cd57735e482fb4aa0aad666b0baed550798e0ee   193751:
 2c3f4e1a0b33d23541d0b29489c3cd6cb15bb150   193743:
 a7fe6063189931e439db0efe3add951e20d30f02   193727:
 6d21780eeb6f64f9523a0c092c07185d9ef1ee2a v: v3

---
 [refs]                    |  2 +-
 trunk/net/mac80211/ibss.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 6ecc2a2a619b..09e91b2e8135 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 819386dfc67e770b4a0b59983f7948f8ddaa357e
+refs/heads/master: 09a08cff3d13315c948e6aee5cf912f8f1db54e7
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index f3e942486749..01974c2510a8 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -264,17 +264,16 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 			sta->sta.supp_rates[band] = supp_rates |
 				ieee80211_mandatory_rates(local, band);
 
+			if (sta->sta.supp_rates[band] != prev_rates) {
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
-			if (sta->sta.supp_rates[band] != prev_rates)
 				printk(KERN_DEBUG "%s: updated supp_rates set "
-				    "for %pM based on beacon info (0x%llx | "
-				    "0x%llx -> 0x%llx)\n",
-				    sdata->name,
-				    sta->sta.addr,
-				    (unsigned long long) prev_rates,
-				    (unsigned long long) supp_rates,
-				    (unsigned long long) sta->sta.supp_rates[band]);
+				    "for %pM based on beacon/probe_response "
+				    "(0x%x -> 0x%x)\n",
+				    sdata->name, sta->sta.addr,
+				    prev_rates, sta->sta.supp_rates[band]);
 #endif
+				rate_control_rate_init(sta);
+			}
 			rcu_read_unlock();
 		} else {
 			rcu_read_unlock();
@@ -370,6 +369,7 @@ 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);
 	}