Re: pull request: wireless-next 2012-05-03

["John W. Linville" <linville@tuxdriver.com>]

On Thu, May 03, 2012 at 01:17:07PM -0400, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> 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 <andre.guedes@openbossa.org>
> 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 <andre.guedes@openbossa.org>
> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
>  ...
> -		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@tuxdriver.com			might be all we have.  Be ready.