2010-05-26 12:33:38

by Juuso Oikarinen

Subject: [PATCH] mac80211: Fix basic rates for created IBSS networks

Currently the mac80211 marks rates 1 and 2 mbps as basic rates for created
ad-hoc networks. To be certifiable, rates 1, 2, 5.5 and 12 need to be marked
basic.

Change this.

Signed-off-by: Juuso Oikarinen <[email protected]>
---
net/mac80211/ibss.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index b2cc1fd..448cf57 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -529,7 +529,8 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
sdata->drop_unencrypted = 0;

__ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int,
- ifibss->channel, 3, /* first two are basic */
+ ifibss->channel,
+ 15, /* 1, 2, 5.5 and 12 are basic */
capability, 0);
}

--
1.6.3.3

2010-05-26 12:35:04

by Johannes Berg

Subject: Re: [PATCH] mac80211: Fix basic rates for created IBSS networks

On Wed, 2010-05-26 at 15:34 +0300, Juuso Oikarinen wrote:
> Currently the mac80211 marks rates 1 and 2 mbps as basic rates for created
> ad-hoc networks. To be certifiable, rates 1, 2, 5.5 and 12 need to be marked
> basic.
>
> Change this.
>
> Signed-off-by: Juuso Oikarinen <[email protected]>
> ---
> net/mac80211/ibss.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
> index b2cc1fd..448cf57 100644
> --- a/net/mac80211/ibss.c
> +++ b/net/mac80211/ibss.c
> @@ -529,7 +529,8 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
> sdata->drop_unencrypted = 0;
>
> __ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int,
> - ifibss->channel, 3, /* first two are basic */
> + ifibss->channel,
> + 15, /* 1, 2, 5.5 and 12 are basic */

12?

In any case, this is incorrect in 5 GHz (at least the comment is).

johannes

2010-05-26 12:41:16

by Juuso Oikarinen

Subject: Re: [PATCH] mac80211: Fix basic rates for created IBSS networks

On Wed, 2010-05-26 at 14:34 +0200, ext Johannes Berg wrote:
> On Wed, 2010-05-26 at 15:34 +0300, Juuso Oikarinen wrote:
> > Currently the mac80211 marks rates 1 and 2 mbps as basic rates for created
> > ad-hoc networks. To be certifiable, rates 1, 2, 5.5 and 12 need to be marked
> > basic.
> >
> > Change this.
> >
> > Signed-off-by: Juuso Oikarinen <[email protected]>
> > ---
> > net/mac80211/ibss.c | 3 ++-
> > 1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
> > index b2cc1fd..448cf57 100644
> > --- a/net/mac80211/ibss.c
> > +++ b/net/mac80211/ibss.c
> > @@ -529,7 +529,8 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
> > sdata->drop_unencrypted = 0;
> >
> > __ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int,
> > - ifibss->channel, 3, /* first two are basic */
> > + ifibss->channel,
> > + 15, /* 1, 2, 5.5 and 12 are basic */
>
> 12?
>
> In any case, this is incorrect in 5 GHz (at least the comment is).

Damn! The comment has a typo!

I must have a serious brain leak.

-Juuso

> johannes
>