From mboxrd@z Thu Jan 1 00:00:00 1970 From: "John W. Linville" Subject: Re: pull request: wireless-next 2012-05-03 Date: Thu, 3 May 2012 13:28:29 -0400 Message-ID: <20120503172829.GN9285@tuxdriver.com> References: <20120503152206.GL9285@tuxdriver.com> <20120503.130516.1008806127286088740.davem@davemloft.net> <20120503.131707.112550136096227430.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: David Miller Return-path: Content-Disposition: inline In-Reply-To: <20120503.131707.112550136096227430.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org On Thu, May 03, 2012 at 01:17:07PM -0400, David Miller wrote: > From: David Miller > Date: Thu, 03 May 2012 13:05:16 -0400 (EDT) > > > Pulled, thanks John. > > Actually, I un-pulled. The bluetooth guys are sending crap code > formatting again. > > From 74e05692c9599866d5c8743764544cf77cd1af87 Mon Sep 17 00:00:00 2001 > From: Andre Guedes > Date: Tue, 6 Mar 2012 19:37:06 -0300 > Subject: [PATCH 007/160] Bluetooth: Check FINDING state in interleaved > discovery > > In order to do interleaved discovery we should be in DISCOVERY_ > FINDING state. Otherwise, discovery should be stopped. > > Signed-off-by: Andre Guedes > Signed-off-by: Gustavo F. Padovan > ... > - if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED) { > + if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED && > + hdev->discovery.state == DISCOVERY_FINDING) { > > Really, we went through this a million times very recently and I'm > not pulling anything into my tree that has garbage like this in it. > > Sorry. No, I'm sorry. I thought we had this worked-out. John -- John W. Linville Someday the world will need a hero, and you linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html