From: Andre Guedes Date: Fri, 17 Feb 2012 23:39:37 +0000 (-0300) Subject: Bluetooth: Merge INQUIRY and LE_SCAN discovery states X-Git-Tag: v3.4-rc1~177^2~112^2~132 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=343f935bfa44189c68527102c409286b0cfc4526;p=pandora-kernel.git Bluetooth: Merge INQUIRY and LE_SCAN discovery states This patch merges DISCOVERY_INQUIRY and DISCOVERY_LE_SCAN states into a new state called DISCOVERY_FINDING. From the discovery perspective, we are pretty much worried about to know just if we are finding devices than what exactly phase of "finding devices" (inquiry or LE scan) we are currently running. Besides, to know if the controller is performing inquiry or LE scan we should check HCI_INQUIRY or HCI_LE_SCAN bits in hdev flags. Moreover, merging this two states will simplify the discovery state machine and will keep interleaved discovery implementation simpler. Signed-off-by: Andre Guedes Acked-by: Marcel Holtmann Signed-off-by: Johan Hedberg --- Reading git-diff-tree failed