linux-kernel - linux-next: manual merge of the bluetooth tree with the wireless tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130927132644.3aca01f917f0bf569a0a6942@canb.auug.org.au>
Date:	Fri, 27 Sep 2013 13:26:44 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Gustavo Padovan <gustavo@...ovan.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Johan Hedberg <johan.hedberg@...el.com>,
	"John W. Linville" <linville@...driver.com>,
	Marcel Holtmann <marcel@...tmann.org>
Subject: linux-next: manual merge of the bluetooth tree with the wireless
 tree

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
net/bluetooth/hci_core.c between commit 5e130367d43f ("Bluetooth:
Introduce a new HCI_RFKILLED flag") from the wireless tree and commit
0736cfa8e5bb ("Bluetooth: Introduce user channel flag for HCI devices")
from the bluetooth tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

P.S. that closing brace is badly indented :-(
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc net/bluetooth/hci_core.c
index 1b66547,3d9f02b..0000000
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@@ -1570,13 -1642,13 +1646,16 @@@ static int hci_rfkill_set_block(void *d
  
  	BT_DBG("%p name %s blocked %d", hdev, hdev->name, blocked);
  
+ 	if (test_bit(HCI_USER_CHANNEL, &hdev->dev_flags))
+ 		return -EBUSY;
+ 
 -	if (!blocked)
 -		return 0;
 -
 -	hci_dev_do_close(hdev);
 +	if (blocked) {
 +		set_bit(HCI_RFKILLED, &hdev->dev_flags);
 +		if (!test_bit(HCI_SETUP, &hdev->dev_flags))
 +			hci_dev_do_close(hdev);
 +	} else {
 +		clear_bit(HCI_RFKILLED, &hdev->dev_flags);
 +}
  
  	return 0;
  }

Content of type "application/pgp-signature" skipped