[PATCH] mac80211: Fix addition of mesh configuration element

[PATCH] mac80211: Fix addition of mesh configuration element

[Ilan Peer]

The code was setting the capabilities byte to zero,
after it was already properly set previously. Fix it.

The bug was found while debugging hwsim mesh tests failures
that happened in commit 76f43b4 (mac80211: Remove invalid flag
operations in mesh TSF synchronization).

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
---
 net/mac80211/mesh.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index cc2a63b..9c23172 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -279,8 +279,6 @@ int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,
 	/* Mesh PS mode. See IEEE802.11-2012 8.4.2.100.8 */
 	*pos |= ifmsh->ps_peers_deep_sleep ?
 			IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL : 0x00;
-	*pos++ = 0x00;
-
 	return 0;
 }
 
-- 
1.9.1

Re: [PATCH] mac80211: Fix addition of mesh configuration element

[Masashi Honma]

On 2016年12月27日 01:17, Ilan Peer wrote:
> The code was setting the capabilities byte to zero,
> after it was already properly set previously. Fix it.
>
> The bug was found while debugging hwsim mesh tests failures
> that happened in commit 76f43b4 (mac80211: Remove invalid flag
> operations in mesh TSF synchronization).

Thanks!

Reviewed-by: Masashi Honma <masashi.honma@gmail.com>

Re: [PATCH] mac80211: Fix addition of mesh configuration element

[Johannes Berg]

On Mon, 2016-12-26 at 18:17 +0200, Ilan Peer wrote:
> The code was setting the capabilities byte to zero,
> after it was already properly set previously. Fix it.
> 
> The bug was found while debugging hwsim mesh tests failures
> that happened in commit 76f43b4 (mac80211: Remove invalid flag
> operations in mesh TSF synchronization).
> 
Applied, thanks.

When you have the commit already, please add a Fixes tag, and also use
12 hex digits to abbreviate SHA1s please. (I've done that now)

johannes

RE: [PATCH] mac80211: Fix addition of mesh configuration element

[Peer, Ilan]

PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBKb2hhbm5lcyBCZXJnIFttYWls
dG86am9oYW5uZXNAc2lwc29sdXRpb25zLm5ldF0NCj4gU2VudDogTW9uZGF5LCBKYW51YXJ5IDAy
LCAyMDE3IDEzOjAwDQo+IFRvOiBQZWVyLCBJbGFuIDxpbGFuLnBlZXJAaW50ZWwuY29tPg0KPiBD
YzogbGludXgtd2lyZWxlc3NAdmdlci5rZXJuZWwub3JnOyBtYXNhc2hpLmhvbm1hQGdtYWlsLmNv
bQ0KPiBTdWJqZWN0OiBSZTogW1BBVENIXSBtYWM4MDIxMTogRml4IGFkZGl0aW9uIG9mIG1lc2gg
Y29uZmlndXJhdGlvbiBlbGVtZW50DQo+IA0KPiBPbiBNb24sIDIwMTYtMTItMjYgYXQgMTg6MTcg
KzAyMDAsIElsYW4gUGVlciB3cm90ZToNCj4gPiBUaGUgY29kZSB3YXMgc2V0dGluZyB0aGUgY2Fw
YWJpbGl0aWVzIGJ5dGUgdG8gemVybywgYWZ0ZXIgaXQgd2FzDQo+ID4gYWxyZWFkeSBwcm9wZXJs
eSBzZXQgcHJldmlvdXNseS4gRml4IGl0Lg0KPiA+DQo+ID4gVGhlIGJ1ZyB3YXMgZm91bmQgd2hp
bGUgZGVidWdnaW5nIGh3c2ltIG1lc2ggdGVzdHMgZmFpbHVyZXMgdGhhdA0KPiA+IGhhcHBlbmVk
IGluIGNvbW1pdCA3NmY0M2I0IChtYWM4MDIxMTogUmVtb3ZlIGludmFsaWQgZmxhZyBvcGVyYXRp
b25zDQo+ID4gaW4gbWVzaCBUU0Ygc3luY2hyb25pemF0aW9uKS4NCj4gPg0KPiBBcHBsaWVkLCB0
aGFua3MuDQo+IA0KPiBXaGVuIHlvdSBoYXZlIHRoZSBjb21taXQgYWxyZWFkeSwgcGxlYXNlIGFk
ZCBhIEZpeGVzIHRhZywgYW5kIGFsc28gdXNlDQo+IDEyIGhleCBkaWdpdHMgdG8gYWJicmV2aWF0
ZSBTSEExcyBwbGVhc2UuIChJJ3ZlIGRvbmUgdGhhdCBub3cpDQo+IA0KDQpTdXJlLiBUaGFua3Mu
DQoNCklsYW4uDQo=

[PATCH] mac80211: Fix addition of mesh configuration element

[Richard Schütz]

From: Ilan peer <ilan.peer@intel.com>

commit 57629915d568c522ac1422df7bba4bee5b5c7a7c upstream.

The code was setting the capabilities byte to zero,
after it was already properly set previously. Fix it.

The bug was found while debugging hwsim mesh tests failures
that happened since the commit mentioned below.

Fixes: 76f43b4c0a93 ("mac80211: Remove invalid flag operations in mesh TSF synchronization")
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Reviewed-by: Masashi Honma <masashi.honma@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Schütz <rschuetz@uni-koblenz.de>
---
 net/mac80211/mesh.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index cc2a63bd233f..9c23172feba0 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -279,8 +279,6 @@ int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,
 	/* Mesh PS mode. See IEEE802.11-2012 8.4.2.100.8 */
 	*pos |= ifmsh->ps_peers_deep_sleep ?
 			IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL : 0x00;
-	*pos++ = 0x00;
-
 	return 0;
 }
 
-- 
2.15.1

Re: [PATCH] mac80211: Fix addition of mesh configuration element

[Greg KH]

On Fri, Dec 15, 2017 at 10:29:29AM +0100, Richard Sch�tz wrote:
> From: Ilan peer <ilan.peer@intel.com>
> 
> commit 57629915d568c522ac1422df7bba4bee5b5c7a7c upstream.
> 
> The code was setting the capabilities byte to zero,
> after it was already properly set previously. Fix it.
> 
> The bug was found while debugging hwsim mesh tests failures
> that happened since the commit mentioned below.
> 
> Fixes: 76f43b4c0a93 ("mac80211: Remove invalid flag operations in mesh TSF synchronization")
> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
> Reviewed-by: Masashi Honma <masashi.honma@gmail.com>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> Signed-off-by: Richard Sch�tz <rschuetz@uni-koblenz.de>
> ---
>  net/mac80211/mesh.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
> index cc2a63bd233f..9c23172feba0 100644
> --- a/net/mac80211/mesh.c
> +++ b/net/mac80211/mesh.c
> @@ -279,8 +279,6 @@ int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,
>  	/* Mesh PS mode. See IEEE802.11-2012 8.4.2.100.8 */
>  	*pos |= ifmsh->ps_peers_deep_sleep ?
>  			IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL : 0x00;
> -	*pos++ = 0x00;
> -
>  	return 0;
>  }
>  
> -- 
> 2.15.1


I'm sorry, I don't understand what you want done with this patch.  Why
send it to stable@?

confused,

greg k-h

Re: [PATCH] mac80211: Fix addition of mesh configuration element

[Richard Schütz]

[-- Attachment #1: Type: text/plain, Size: 1696 bytes --]

On 12/15/2017 10:49 AM, Greg KH wrote:
> On Fri, Dec 15, 2017 at 10:29:29AM +0100, Richard Schütz wrote:
>> From: Ilan peer <ilan.peer@intel.com>
>>
>> commit 57629915d568c522ac1422df7bba4bee5b5c7a7c upstream.
>>
>> The code was setting the capabilities byte to zero,
>> after it was already properly set previously. Fix it.
>>
>> The bug was found while debugging hwsim mesh tests failures
>> that happened since the commit mentioned below.
>>
>> Fixes: 76f43b4c0a93 ("mac80211: Remove invalid flag operations in mesh TSF synchronization")
>> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
>> Reviewed-by: Masashi Honma <masashi.honma@gmail.com>
>> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>> Signed-off-by: Richard Schütz <rschuetz@uni-koblenz.de>
>> ---
>>   net/mac80211/mesh.c | 2 --
>>   1 file changed, 2 deletions(-)
>>
>> diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
>> index cc2a63bd233f..9c23172feba0 100644
>> --- a/net/mac80211/mesh.c
>> +++ b/net/mac80211/mesh.c
>> @@ -279,8 +279,6 @@ int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,
>>   	/* Mesh PS mode. See IEEE802.11-2012 8.4.2.100.8 */
>>   	*pos |= ifmsh->ps_peers_deep_sleep ?
>>   			IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL : 0x00;
>> -	*pos++ = 0x00;
>> -
>>   	return 0;
>>   }
>>   
>> -- 
>> 2.15.1
> 
> 
> I'm sorry, I don't understand what you want done with this patch.  Why
> send it to stable@?
> 
> confused,
> 
> greg k-h
> 

AUTOSEL picked up 76f43b4c0a93 for stable a short while ago, but not 
this accompanying fix. Currently wireless mesh networking is severely 
impacted in stable because of that.

-- 
Richard


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 5087 bytes --]

Re: [PATCH] mac80211: Fix addition of mesh configuration element

[Greg KH]

On Fri, Dec 15, 2017 at 11:31:27AM +0100, Richard Sch�tz wrote:
> On 12/15/2017 10:49 AM, Greg KH wrote:
> > On Fri, Dec 15, 2017 at 10:29:29AM +0100, Richard Sch�tz wrote:
> > > From: Ilan peer <ilan.peer@intel.com>
> > > 
> > > commit 57629915d568c522ac1422df7bba4bee5b5c7a7c upstream.
> > > 
> > > The code was setting the capabilities byte to zero,
> > > after it was already properly set previously. Fix it.
> > > 
> > > The bug was found while debugging hwsim mesh tests failures
> > > that happened since the commit mentioned below.
> > > 
> > > Fixes: 76f43b4c0a93 ("mac80211: Remove invalid flag operations in mesh TSF synchronization")
> > > Signed-off-by: Ilan Peer <ilan.peer@intel.com>
> > > Reviewed-by: Masashi Honma <masashi.honma@gmail.com>
> > > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> > > Signed-off-by: Richard Sch�tz <rschuetz@uni-koblenz.de>
> > > ---
> > >   net/mac80211/mesh.c | 2 --
> > >   1 file changed, 2 deletions(-)
> > > 
> > > diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
> > > index cc2a63bd233f..9c23172feba0 100644
> > > --- a/net/mac80211/mesh.c
> > > +++ b/net/mac80211/mesh.c
> > > @@ -279,8 +279,6 @@ int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,
> > >   	/* Mesh PS mode. See IEEE802.11-2012 8.4.2.100.8 */
> > >   	*pos |= ifmsh->ps_peers_deep_sleep ?
> > >   			IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL : 0x00;
> > > -	*pos++ = 0x00;
> > > -
> > >   	return 0;
> > >   }
> > > -- 
> > > 2.15.1
> > 
> > 
> > I'm sorry, I don't understand what you want done with this patch.  Why
> > send it to stable@?
> > 
> > confused,
> > 
> > greg k-h
> > 
> 
> AUTOSEL picked up 76f43b4c0a93 for stable a short while ago, but not this
> accompanying fix. Currently wireless mesh networking is severely impacted in
> stable because of that.

Ah, ok, thanks, that makes sense, now queued up.

greg k-h