2013-02-27 12:02:59

by Karl Beldan

Subject: [PATCH 1/2] mac80211: get the rates masks from the txrc in rate_control_get_rate

From: Karl Beldan <[email protected]>

Currently it gets it from the sdata, the behavior remains unchanged.

Signed-off-by: Karl Beldan <[email protected]>
---
net/mac80211/rate.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index dd88381..cfbd7d5 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -459,9 +459,8 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
* default mask (allow all rates) is used to save some processing for
* the common case.
*/
- mask = sdata->rc_rateidx_mask[info->band];
- memcpy(mcs_mask, sdata->rc_rateidx_mcs_mask[info->band],
- sizeof(mcs_mask));
+ mask = txrc->rate_idx_mask;
+ memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask));
if (mask != (1 << txrc->sband->n_bitrates) - 1) {
if (sta) {
/* Filter out rates that the STA does not support */
--
1.7.10.GIT

2013-02-27 13:40:27

by Karl Beldan

Subject: Re: [PATCH 2/2] mac80211: fix the check for mcs rates masking

On Wed, Feb 27, 2013 at 01:00:34PM +0100, Karl Beldan wrote:
> From: Karl Beldan <[email protected]>
>
> Currently the mcs bitrates mask rate_idx_mcs_mask is only applied when
> the pre-ht bitrates mask rate_idx_mask of the same band differs from the
> default mask.
> Fix it by comparing the rate_idx_mcs_mask with the ht_cap.mcs.rx_mask, the
> copy of the rate_idx_mcs_mask is now done if the check succeeds.
> This results, when no pre-ht bitrates is disabled && an mcs idx is, to
> one more memcmp, otherwise the cost remains identical.
>
> Signed-off-by: Karl Beldan <[email protected]>
> ---
> net/mac80211/rate.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
> index cfbd7d5..4c0a14d 100644
> --- a/net/mac80211/rate.c
> +++ b/net/mac80211/rate.c
> @@ -460,8 +460,11 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
> * the common case.
> */
> mask = txrc->rate_idx_mask;
> - memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask));
> - if (mask != (1 << txrc->sband->n_bitrates) - 1) {
> + if (mask != (1 << txrc->sband->n_bitrates) - 1 ||
> + memcmp(txrc->sband->ht_cap.mcs.rx_mask, txrc->rate_idx_mcs_mask,
> + sizeof(txrc->rate_idx_mcs_mask))) {
> + memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask));
> +
> if (sta) {
>

I don't know why I refrained myself from getting rid of the copies of
the masks altogether.

2013-02-27 12:03:02

by Karl Beldan

Subject: [PATCH 2/2] mac80211: fix the check for mcs rates masking

From: Karl Beldan <[email protected]>

Currently the mcs bitrates mask rate_idx_mcs_mask is only applied when
the pre-ht bitrates mask rate_idx_mask of the same band differs from the
default mask.
Fix it by comparing the rate_idx_mcs_mask with the ht_cap.mcs.rx_mask, the
copy of the rate_idx_mcs_mask is now done if the check succeeds.
This results, when no pre-ht bitrates is disabled && an mcs idx is, to
one more memcmp, otherwise the cost remains identical.

Signed-off-by: Karl Beldan <[email protected]>
---
net/mac80211/rate.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index cfbd7d5..4c0a14d 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -460,8 +460,11 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
* the common case.
*/
mask = txrc->rate_idx_mask;
- memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask));
- if (mask != (1 << txrc->sband->n_bitrates) - 1) {
+ if (mask != (1 << txrc->sband->n_bitrates) - 1 ||
+ memcmp(txrc->sband->ht_cap.mcs.rx_mask, txrc->rate_idx_mcs_mask,
+ sizeof(txrc->rate_idx_mcs_mask))) {
+ memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask));
+
if (sta) {
/* Filter out rates that the STA does not support */
mask &= sta->sta.supp_rates[info->band];
--
1.7.10.GIT

2013-03-04 18:31:17

by Karl Beldan

Subject: Re: [PATCH 2/2] mac80211: fix the check for mcs rates masking

On Mon, Mar 04, 2013 at 04:50:28PM +0100, Johannes Berg wrote:
> On Wed, 2013-02-27 at 14:38 +0100, Karl Beldan wrote:
>
> > > mask = txrc->rate_idx_mask;
> > > - memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask));
> > > - if (mask != (1 << txrc->sband->n_bitrates) - 1) {
> > > + if (mask != (1 << txrc->sband->n_bitrates) - 1 ||
> > > + memcmp(txrc->sband->ht_cap.mcs.rx_mask, txrc->rate_idx_mcs_mask,
> > > + sizeof(txrc->rate_idx_mcs_mask))) {
> > > + memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask));
> > > +
> > > if (sta) {
> > >
> >
> > I don't know why I refrained myself from getting rid of the copies of
> > the masks altogether.
>
> Are you going to resend?
>
Just did.

2013-03-04 15:50:33

by Johannes Berg

Subject: Re: [PATCH 2/2] mac80211: fix the check for mcs rates masking

On Wed, 2013-02-27 at 14:38 +0100, Karl Beldan wrote:

> > mask = txrc->rate_idx_mask;
> > - memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask));
> > - if (mask != (1 << txrc->sband->n_bitrates) - 1) {
> > + if (mask != (1 << txrc->sband->n_bitrates) - 1 ||
> > + memcmp(txrc->sband->ht_cap.mcs.rx_mask, txrc->rate_idx_mcs_mask,
> > + sizeof(txrc->rate_idx_mcs_mask))) {
> > + memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask));
> > +
> > if (sta) {
> >
>
> I don't know why I refrained myself from getting rid of the copies of
> the masks altogether.

Are you going to resend?

johannes