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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1187 bytes --]

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@canb.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;
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Gustavo Padovan]

Hi Stephen,

2013-09-27 Stephen Rothwell <sfr@canb.auug.org.au>:

> 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.

Thanks for reporting, I knew about it about but didn't had any time to fix it
yesterday. I just merged bluetooth.git on bluetooth-next.git and fixed this.
> 
> 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 :-(

Yeah, it is now fixed on bluetooth-next at least.

	Gustavo

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

[Gustavo Padovan]

[-- Attachment #1: Type: text/plain, Size: 635 bytes --]

Hi Stephen,

* Stephen Rothwell <sfr@canb.auug.org.au> [2012-06-12 11:47:01 +1000]:

> Hi Gustavo,
> 
> Today's linux-next merge of the bluetooth tree got a conflict in
> net/bluetooth/hci_event.c between commit 1c2e00418317 ("Bluetooth: Add
> support for encryption key refresh") from the wireless tree and commit
> 6039aa73a132 ("Bluetooth: Remove most of the inline usage") from the
> bluetooth tree.

That is because I just merged bluetooth tree into bluetooth-next, should be
fixed on wireless-next once I do a pull request to John(this is already fixed
in bluetooth-next). Thanks for spotting me this.

	Gustavo

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2069 bytes --]

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
net/bluetooth/hci_event.c between commit 1c2e00418317 ("Bluetooth: Add
support for encryption key refresh") from the wireless tree and commit
6039aa73a132 ("Bluetooth: Remove most of the inline usage") from the
bluetooth tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/bluetooth/hci_event.c
index 94ad124,47656be..0000000
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@@ -3043,51 -3040,7 +3040,51 @@@ static void hci_extended_inquiry_result
  	hci_dev_unlock(hdev);
  }
  
 +static void hci_key_refresh_complete_evt(struct hci_dev *hdev,
 +					 struct sk_buff *skb)
 +{
 +	struct hci_ev_key_refresh_complete *ev = (void *) skb->data;
 +	struct hci_conn *conn;
 +
 +	BT_DBG("%s status %u handle %u", hdev->name, ev->status,
 +	       __le16_to_cpu(ev->handle));
 +
 +	hci_dev_lock(hdev);
 +
 +	conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
 +	if (!conn)
 +		goto unlock;
 +
 +	if (!ev->status)
 +		conn->sec_level = conn->pending_sec_level;
 +
 +	clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
 +
 +	if (ev->status && conn->state == BT_CONNECTED) {
 +		hci_acl_disconn(conn, HCI_ERROR_AUTH_FAILURE);
 +		hci_conn_put(conn);
 +		goto unlock;
 +	}
 +
 +	if (conn->state == BT_CONFIG) {
 +		if (!ev->status)
 +			conn->state = BT_CONNECTED;
 +
 +		hci_proto_connect_cfm(conn, ev->status);
 +		hci_conn_put(conn);
 +	} else {
 +		hci_auth_cfm(conn, ev->status);
 +
 +		hci_conn_hold(conn);
 +		conn->disc_timeout = HCI_DISCONN_TIMEOUT;
 +		hci_conn_put(conn);
 +	}
 +
 +unlock:
 +	hci_dev_unlock(hdev);
 +}
 +
- static inline u8 hci_get_auth_req(struct hci_conn *conn)
+ static u8 hci_get_auth_req(struct hci_conn *conn)
  {
  	/* If remote requests dedicated bonding follow that lead */
  	if (conn->remote_auth == 0x02 || conn->remote_auth == 0x03) {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]