Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 819386df authored by John W. Linville's avatar John W. Linville
Browse files

Revert "mac80211: fix rates setup on IBSS merge" 



I accidentally merged an incomplete version of the patch...

This reverts commit b4d59a93.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bf18723d

net/mac80211/ibss.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -276,8 +276,6 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 
				    (unsigned long long) sta->sta.supp_rates[band]);

				    (unsigned long long) sta->sta.supp_rates[band]);

#endif

#endif

			rcu_read_unlock();

			rcu_read_unlock();



			/* FIXME: update rate control */

		} else {

		} else {

			rcu_read_unlock();

			rcu_read_unlock();

			ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,

			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);

		       sdata->name, mgmt->bssid);

#endif

#endif

		ieee80211_sta_join_ibss(sdata, bss);

		ieee80211_sta_join_ibss(sdata, bss);

		supp_rates = ieee80211_sta_get_rates(local, elems, band);

		ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,

		ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,

				       supp_rates, GFP_KERNEL);

				       supp_rates, GFP_KERNEL);

	}

	}