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]

Date:	Tue, 12 Jun 2012 11:47:01 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Gustavo F. Padovan" <padovan@...fusion.mobi>
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_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@...b.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) {

Content of type "application/pgp-signature" skipped