View | Details | Raw Unified | Return to bug 219088
Collapse All | Expand All

(-)a/net/bluetooth/hci_core.c (-7 lines)
Lines 119-131 void hci_discovery_set_state(struct hci_dev *hdev, int state) Link Here
119 
	case DISCOVERY_STARTING:
 119 
	case DISCOVERY_STARTING:
120 
		break;
 120 
		break;
121 
	case DISCOVERY_FINDING:
 121 
	case DISCOVERY_FINDING:
122 
		/* If discovery was not started then it was initiated by the
123 
		 * MGMT interface so no MGMT event shall be generated either
124 
		 */
125 
		if (old_state != DISCOVERY_STARTING) {
126 
			hdev->discovery.state = old_state;
127 
			return;
128 
		}
129 
		mgmt_discovering(hdev, 1);
 122 
		mgmt_discovering(hdev, 1);
130 
		break;
 123 
		break;
131 
	case DISCOVERY_RESOLVING:
 124 
	case DISCOVERY_RESOLVING:
(-)a/net/bluetooth/hci_event.c (-3 / +3 lines)
Lines 1721-1729 static void le_set_scan_enable_complete(struct hci_dev *hdev, u8 enable) Link Here
1721 
	switch (enable) {
 1721 
	switch (enable) {
1722 
	case LE_SCAN_ENABLE:
 1722 
	case LE_SCAN_ENABLE:
1723 
		hci_dev_set_flag(hdev, HCI_LE_SCAN);
 1723 
		hci_dev_set_flag(hdev, HCI_LE_SCAN);
1724 
		if (hdev->le_scan_type == LE_SCAN_ACTIVE)
 1724 
		if (hdev->le_scan_type == LE_SCAN_ACTIVE) {
1725 
			clear_pending_adv_report(hdev);
 1725 
			clear_pending_adv_report(hdev);
1726 
		hci_discovery_set_state(hdev, DISCOVERY_FINDING);
 1726 
			hci_discovery_set_state(hdev, DISCOVERY_FINDING);
1727 
		}
1727 
		break;
 1728 
		break;
1728 

          1729
          

        

        

          1729
          
	case LE_SCAN_DISABLE:

          1730
          
	case LE_SCAN_DISABLE:

        

            

              1730
              
- 

              
              
            






  

  Return to bug 219088