diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-03-16 15:02:35 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-03-16 15:05:23 -0400 |
| commit | 819386dfc67e770b4a0b59983f7948f8ddaa357e (patch) | |
| tree | 9fa7a7944abd3a693a467a6d9c37908d10e48dae | |
| parent | bf18723d50206a0b485e438f14c22faf91a3908f (diff) | |
| download | op-kernel-dev-819386dfc67e770b4a0b59983f7948f8ddaa357e.zip op-kernel-dev-819386dfc67e770b4a0b59983f7948f8ddaa357e.tar.gz | |
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>
| -rw-r--r-- | net/mac80211/ibss.c | 3 |
1 files changed, 0 insertions, 3 deletions
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 @@ 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); } |
