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

Commit 09a08cff authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

mac80211: (really) fix rates setup on IBSS merge 



when an IBSS merge happened, the supported rates for the newly added station
were left empty, causing the rate control module to be initialized with only
the basic rates.

the section of the ibss code which deals with updating supported rates for
an already existing station failed to inform the rate control module about the
new rates. as both minstrel and pid don't have an update function i just use
the init function.

also remove unnecessary (unsigned long long) casts and edit debug message.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 819386df

net/mac80211/ibss.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -264,17 +264,16 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 
			sta->sta.supp_rates[band] = supp_rates |

			sta->sta.supp_rates[band] = supp_rates |

				ieee80211_mandatory_rates(local, band);

				ieee80211_mandatory_rates(local, band);





			if (sta->sta.supp_rates[band] != prev_rates) {

#ifdef CONFIG_MAC80211_IBSS_DEBUG

#ifdef CONFIG_MAC80211_IBSS_DEBUG

			if (sta->sta.supp_rates[band] != prev_rates)

				printk(KERN_DEBUG "%s: updated supp_rates set "

				printk(KERN_DEBUG "%s: updated supp_rates set "

				    "for %pM based on beacon info (0x%llx | "

				    "for %pM based on beacon/probe_response "

				    "0x%llx -> 0x%llx)\n",

				    "(0x%x -> 0x%x)\n",

				    sdata->name,

				    sdata->name, sta->sta.addr,

				    sta->sta.addr,

				    prev_rates, sta->sta.supp_rates[band]);

				    (unsigned long long) prev_rates,

				    (unsigned long long) supp_rates,

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

#endif

#endif

				rate_control_rate_init(sta);

			}

			rcu_read_unlock();

			rcu_read_unlock();

		} else {

		} else {

			rcu_read_unlock();

			rcu_read_unlock();
@@ -370,6 +369,7 @@ 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);

	}

	}