On Sat, May 21, 2011 at 1:42 AM, Johannes Berg <johannes@xxxxxxxxxxxxxxxx> 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 -- 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