OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bf18723
)
Revert "mac80211: fix rates setup on IBSS merge"
author
John W. Linville
<linville@tuxdriver.com>
Tue, 16 Mar 2010 19:02:35 +0000
(15:02 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 16 Mar 2010 19:05:23 +0000
(15:05 -0400)
I accidentally merged an incomplete version of the patch...
This reverts commit
b4d59a9317e41faec3d0b6a03f0454d1e8abb710
.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ibss.c
patch
|
blob
|
history
diff --git
a/net/mac80211/ibss.c
b/net/mac80211/ibss.c
index
b840d90
..
f3e9424
100644
(file)
--- a/
net/mac80211/ibss.c
+++ b/
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);
}