On Mon, 2011-12-19 at 15:14 +0100, Simon Wunderlich wrote:
> +++ b/net/mac80211/iface.c
> @@ -1180,6 +1180,9 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
> sband = local->hw.wiphy->bands[i];
> sdata->rc_rateidx_mask[i] =
> sband ? (1 << sband->n_bitrates) - 1 : 0;
> + memset(sdata->rc_rateidx_mcs_mask[i], sband ? 0xff : 0,
> + sizeof(sdata->rc_rateidx_mcs_mask[i]));
> +
> }
Similar comment as before; there's also a spurious blank line here.
> --- a/net/mac80211/rate.c
> +++ b/net/mac80211/rate.c
> @@ -267,10 +267,10 @@ bool rate_control_send_low(struct ieee80211_sta *sta,
>
> if (!sta || !priv_sta || rc_no_data_or_no_ack_use_min(txrc)) {
> if ((sband->band != IEEE80211_BAND_2GHZ) ||
> - !(info->flags & IEEE80211_TX_CTL_NO_CCK_RATE))
> + !(info->flags & IEEE80211_TX_CTL_NO_CCK_RATE)) {
> info->control.rates[0].idx =
> rate_lowest_index(txrc->sband, sta);
> - else
> + } else
> info->control.rates[0].idx =
> rate_lowest_non_cck_index(txrc->sband, sta);
> info->control.rates[0].count =
Hmm? I see no change here?
> @@ -293,25 +293,128 @@ bool rate_control_send_low(struct ieee80211_sta *sta,
> }
> EXPORT_SYMBOL(rate_control_send_low);
>
> -static void rate_idx_match_mask(struct ieee80211_tx_rate *rate,
> - int n_bitrates, u32 mask)
> +static bool rate_idx_match_legacy_mask(struct ieee80211_tx_rate *rate,
> + int n_bitrates, u32 mask)
> {
> int j;
>
> - /* See whether the selected rate or anything below it is allowed. */
> + /* See whether the selected rate or anything below
> + * it is allowed. */
why change the comment format (and do it wrong while at it)?
> }
> }
> -
> /* Try to find a higher rate that would be allowed */
?
> @@ -358,10 +462,14 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
> * the common case.
> */
> mask = sdata->rc_rateidx_mask[info->band];
> + memcpy(mcs_mask, sdata->rc_rateidx_mcs_mask[info->band],
> + sizeof(mcs_mask));
Do we really have to do this? Might not a pointer be better?
> if (mask != (1 << txrc->sband->n_bitrates) - 1) {
> if (sta) {
> /* Filter out rates that the STA does not support */
> mask &= sta->sta.supp_rates[info->band];
> + for (i = 0; i < sizeof(mcs_mask); i++)
> + mcs_mask[i] &= sta->sta.ht_cap.mcs.rx_mask[i];
Oh, so it's filtered by station ... hm ok I guess unless we tie
lifetimes together we have to do this.
Maybe we could update all stations in the slow-path (changes in the HT
mask) and then just use the already masked version in the sta entry in
the fastpath here?
johannes
--
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
