2011-05-20 18:55:10

by Johannes Berg

[permalink] [raw]
Subject: netlink reverts

John,

Please revert
9c3990aaec0ad9f686ef6480f6861f2df89b2a7a
ASAP; you'll have to revert
8958da779b92da60e90d9761549b88677a6a3eef
first. (alternatively, if you're feeling less pissed off than I am you
can fix it I guess)

Javier fucked up the netlink attribute types again by inserting
something in the middle, and I'm really mad about it too.

johannes



2011-05-21 00:05:33

by Javier Cardona

[permalink] [raw]
Subject: Re: netlink reverts

On Fri, May 20, 2011 at 11:59 AM, Johannes Berg
<[email protected]> wrote:
> On Fri, 2011-05-20 at 11:57 -0700, Johannes Berg wrote:
>> John,
>>
>> Please revert
>> 9c3990aaec0ad9f686ef6480f6861f2df89b2a7a
>> ASAP; you'll have to revert
>> 8958da779b92da60e90d9761549b88677a6a3eef
>> first. (alternatively, if you're feeling less pissed off than I am you
>> can fix it I guess)
>>
>> Javier fucked up the netlink attribute types again by inserting
>> something in the middle, and I'm really mad about it too.
>
> Hmm, maybe I shot first and then asked questions ;-) Looking at it again
> it _might_ have been introduced by merge issues?

Don't shoot me, please, it really _was_ a merge issue. My patch did
not insert anything in the middle:
https://patchwork.kernel.org/patch/752292 and it was sent a day
before you sent the patch adding WoWLAN support:
https://patchwork.kernel.org/patch/753772/

Cheers,

Javier

--
Javier Cardona
cozybit Inc.
http://www.cozybit.com

2011-05-24 15:49:59

by Johannes Berg

[permalink] [raw]
Subject: Re: netlink reverts

On Sat, 2011-05-21 at 08:40 -0700, Javier Cardona wrote:

> It's ok to move the plink_state attribute. There are only a handful
> of users of the secured mesh at this point.

Let's stick to what we have and all copy a new nl80211.h from the
current tree, I had this in iw but nobody could really be using it since
no driver has wowlan.

johannes


2011-05-20 18:56:30

by Johannes Berg

[permalink] [raw]
Subject: Re: netlink reverts

On Fri, 2011-05-20 at 11:57 -0700, Johannes Berg wrote:
> John,
>
> Please revert
> 9c3990aaec0ad9f686ef6480f6861f2df89b2a7a
> ASAP; you'll have to revert
> 8958da779b92da60e90d9761549b88677a6a3eef
> first. (alternatively, if you're feeling less pissed off than I am you
> can fix it I guess)
>
> Javier fucked up the netlink attribute types again by inserting
> something in the middle, and I'm really mad about it too.

Hmm, maybe I shot first and then asked questions ;-) Looking at it again
it _might_ have been introduced by merge issues?

In any case there's a patch inserting an attribute in the middle. GRRRR.

johannes


2011-05-21 15:41:00

by Javier Cardona

[permalink] [raw]
Subject: Re: netlink reverts

On Sat, May 21, 2011 at 1:42 AM, Johannes Berg
<[email protected]> wrote:
> On Fri, 20 May 2011 17:05:12 -0700, Javier Cardona wrote:
>>
>> Don't shoot me, please, it really _was_ a merge issue. ?My patch did
>> not insert anything in the middle:
>> https://patchwork.kernel.org/patch/752292 ?and it was sent a day
>> before you sent the patch adding WoWLAN support:
>> https://patchwork.kernel.org/patch/753772/
>
> Yeah, my mistake, sorry :( I spent half an hour trying to figure out why
> wowlan was just not doing anything and got really confused...
>
> I wonder what we can do to fix it. Reverting it doesn't really help anyone
> either. I have WoWLAN committed in iw and it suddenly fails working in
> mysterious ways because of the added attribute. I suppose you have the same
> problem somewhere with the mesh tools though? Maybe we can just move the
> plink attribute? iw's master branch already has the wowlan code ... But I
> could just as well update nl80211.h in iw I suppose since it's all not
> released anyway, thoughts?

It's ok to move the plink_state attribute. There are only a handful
of users of the secured mesh at this point.

Javier

--
Javier Cardona
cozybit Inc.
http://www.cozybit.com

2011-05-24 15:58:48

by Eliad Peller

[permalink] [raw]
Subject: Re: netlink reverts

On Tue, May 24, 2011 at 6:49 PM, Johannes Berg
<[email protected]> wrote:
> On Sat, 2011-05-21 at 08:40 -0700, Javier Cardona wrote:
>
>> It's ok to move the plink_state attribute. ?There are only a handful
>> of users of the secured mesh at this point.
>
> Let's stick to what we have and all copy a new nl80211.h from the
> current tree, I had this in iw but nobody could really be using it since
> no driver has wowlan.
>
that's not entirely true, but i don't care moving to the new nl80211.h ;)

2011-05-21 08:42:15

by Johannes Berg

[permalink] [raw]
Subject: Re: netlink reverts

On Fri, 20 May 2011 17:05:12 -0700, Javier Cardona wrote:
> Don't shoot me, please, it really _was_ a merge issue. My patch did
> not insert anything in the middle:
> https://patchwork.kernel.org/patch/752292 and it was sent a day
> before you sent the patch adding WoWLAN support:
> https://patchwork.kernel.org/patch/753772/

Yeah, my mistake, sorry :( I spent half an hour trying to figure out
why wowlan was just not doing anything and got really confused...

I wonder what we can do to fix it. Reverting it doesn't really help
anyone either. I have WoWLAN committed in iw and it suddenly fails
working in mysterious ways because of the added attribute. I suppose you
have the same problem somewhere with the mesh tools though? Maybe we can
just move the plink attribute? iw's master branch already has the wowlan
code ... But I could just as well update nl80211.h in iw I suppose since
it's all not released anyway, thoughts?

johannes