I'll let that run tonight as well. Although I think the comment about
using rate_control_rate_update instead of rate_control_rate_init would
be important to future developers. I also notice that mlme.c calls
rate_control_rate_update. I'm not sure what that does. Someone
familiar with that may want to investigate, it's probably a big deal if
someone changes bands and all the supported rates change.
Alternately, it may be ok just to stick a stub in like this for now:
static void minstrel_rate_update(void *priv, struct
ieee80211_supported_band *sband,
struct ieee80211_sta *sta, void *priv_sta, u32 changed) {
minstrel_rate_init(priv, sband, sta, priv_sta);
}
( and update mac80211_minstrel )
Thoughts?
--Adam
Christian Lamparter wrote:
On Thursday 12 November 2009 23:38:07 Adam Wozniak wrote:
I see what you're doing there.
That didn't quite work, but I'm fairly confident this one will.
yep, what about the attached version? ...it's slightly different...
BTW: Use "diff -up" or "diff -uprN" to create patches. (or git :) )
---
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index fbffce9..7c6c170 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -246,9 +246,12 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
if (!channel || channel->flags & IEEE80211_CHAN_DISABLED)
return;
+ /* make sure mandatory rates are always added */
+ supp_rates = ieee80211_mandatory_rates(local, band);
+
if (sdata->vif.type == NL80211_IFTYPE_ADHOC && elems->supp_rates &&
memcmp(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) {
- supp_rates = ieee80211_sta_get_rates(local, elems, band);
+ supp_rates |= ieee80211_sta_get_rates(local, elems, band);
rcu_read_lock();
@@ -257,9 +260,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
u32 prev_rates;
prev_rates = sta->sta.supp_rates[band];
- /* make sure mandatory rates are always added */
- sta->sta.supp_rates[band] = supp_rates |
- ieee80211_mandatory_rates(local, band);
+ sta->sta.supp_rates[band] = supp_rates;
#ifdef CONFIG_MAC80211_IBSS_DEBUG
if (sta->sta.supp_rates[band] != prev_rates)
@@ -272,6 +273,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
(unsigned long long) supp_rates,
(unsigned long long) sta->sta.supp_rates[band]);
#endif
+ rate_control_rate_init(sta);
} else
ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, supp_rates);
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
