Commit c1f23a2b authored by Johannes Berg's avatar Johannes Berg Committed by Marcel Holtmann
Browse files

Bluetooth: Fix variable shadow warnings 



Sparse points out three places where variables are shadowed,
rename two of the variables and remove the duplicate third.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent f38ba941

net/bluetooth/hci_event.c

+7 −5
Original line number Diff line number Diff line
@@ -1296,9 +1296,11 @@ static void hci_cs_remote_name_req(struct hci_dev *hdev, __u8 status) 
		goto unlock;



	if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->flags)) {

		struct hci_cp_auth_requested cp;

		cp.handle = __cpu_to_le16(conn->handle);

		hci_send_cmd(hdev, HCI_OP_AUTH_REQUESTED, sizeof(cp), &cp);

		struct hci_cp_auth_requested auth_cp;



		auth_cp.handle = __cpu_to_le16(conn->handle);

		hci_send_cmd(hdev, HCI_OP_AUTH_REQUESTED,

			     sizeof(auth_cp), &auth_cp);

	}



unlock:
@@ -3660,8 +3662,8 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) 
	skb_pull(skb, HCI_EVENT_HDR_SIZE);



	if (hdev->sent_cmd && bt_cb(hdev->sent_cmd)->req.event == event) {

		struct hci_command_hdr *hdr = (void *) hdev->sent_cmd->data;

		u16 opcode = __le16_to_cpu(hdr->opcode);

		struct hci_command_hdr *cmd_hdr = (void *) hdev->sent_cmd->data;

		u16 opcode = __le16_to_cpu(cmd_hdr->opcode);



		hci_req_cmd_complete(hdev, opcode, 0);

	}

net/bluetooth/l2cap_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, 
		}



		if (opt == BT_FLUSHABLE_OFF) {

			struct l2cap_conn *conn = chan->conn;

			conn = chan->conn;

			/* proceed further only when we have l2cap_conn and

			   No Flush support in the LM */

			if (!conn || !lmp_no_flush_capable(conn->hcon->hdev)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE