From: Johan Hedberg <johan.hedberg@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v5 25/26] Bluetooth: Simplify address parameters of user_pairing_resp()
Date: Fri, 15 Mar 2013 17:07:15 -0500 [thread overview]
Message-ID: <1363385236-25704-26-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1363385236-25704-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
Instead of passing the bdaddr and bdaddr_type as separate parameters to
user_pairing_resp it's simpler to just pass the original mgmt_addr_info
struct which contains both values.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
---
net/bluetooth/mgmt.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 75c9d92..8587229 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2300,7 +2300,7 @@ unlock:
}
static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
- bdaddr_t *bdaddr, u8 type, u16 mgmt_op,
+ struct mgmt_addr_info *addr, u16 mgmt_op,
u16 hci_op, __le32 passkey)
{
struct pending_cmd *cmd;
@@ -2315,10 +2315,10 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
goto done;
}
- if (type == BDADDR_BREDR)
- conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, bdaddr);
+ if (addr->type == BDADDR_BREDR)
+ conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &addr->bdaddr);
else
- conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, bdaddr);
+ conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &addr->bdaddr);
if (!conn) {
err = cmd_status(sk, hdev->id, mgmt_op,
@@ -2326,7 +2326,7 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
goto done;
}
- if (type == BDADDR_LE_PUBLIC || type == BDADDR_LE_RANDOM) {
+ if (addr->type == BDADDR_LE_PUBLIC || addr->type == BDADDR_LE_RANDOM) {
/* Continue with pairing via SMP */
err = smp_user_confirm_reply(conn, mgmt_op, passkey);
@@ -2340,7 +2340,7 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
goto done;
}
- cmd = mgmt_pending_add(sk, mgmt_op, hdev, bdaddr, sizeof(*bdaddr));
+ cmd = mgmt_pending_add(sk, mgmt_op, hdev, addr, sizeof(*addr));
if (!cmd) {
err = -ENOMEM;
goto done;
@@ -2350,11 +2350,12 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
if (hci_op == HCI_OP_USER_PASSKEY_REPLY) {
struct hci_cp_user_passkey_reply cp;
- bacpy(&cp.bdaddr, bdaddr);
+ bacpy(&cp.bdaddr, &addr->bdaddr);
cp.passkey = passkey;
err = hci_send_cmd(hdev, hci_op, sizeof(cp), &cp);
} else
- err = hci_send_cmd(hdev, hci_op, sizeof(*bdaddr), bdaddr);
+ err = hci_send_cmd(hdev, hci_op, sizeof(addr->bdaddr),
+ &addr->bdaddr);
if (err < 0)
mgmt_pending_remove(cmd);
@@ -2371,7 +2372,7 @@ static int pin_code_neg_reply(struct sock *sk, struct hci_dev *hdev,
BT_DBG("");
- return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
+ return user_pairing_resp(sk, hdev, &cp->addr,
MGMT_OP_PIN_CODE_NEG_REPLY,
HCI_OP_PIN_CODE_NEG_REPLY, 0);
}
@@ -2387,7 +2388,7 @@ static int user_confirm_reply(struct sock *sk, struct hci_dev *hdev, void *data,
return cmd_status(sk, hdev->id, MGMT_OP_USER_CONFIRM_REPLY,
MGMT_STATUS_INVALID_PARAMS);
- return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
+ return user_pairing_resp(sk, hdev, &cp->addr,
MGMT_OP_USER_CONFIRM_REPLY,
HCI_OP_USER_CONFIRM_REPLY, 0);
}
@@ -2399,7 +2400,7 @@ static int user_confirm_neg_reply(struct sock *sk, struct hci_dev *hdev,
BT_DBG("");
- return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
+ return user_pairing_resp(sk, hdev, &cp->addr,
MGMT_OP_USER_CONFIRM_NEG_REPLY,
HCI_OP_USER_CONFIRM_NEG_REPLY, 0);
}
@@ -2411,7 +2412,7 @@ static int user_passkey_reply(struct sock *sk, struct hci_dev *hdev, void *data,
BT_DBG("");
- return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
+ return user_pairing_resp(sk, hdev, &cp->addr,
MGMT_OP_USER_PASSKEY_REPLY,
HCI_OP_USER_PASSKEY_REPLY, cp->passkey);
}
@@ -2423,7 +2424,7 @@ static int user_passkey_neg_reply(struct sock *sk, struct hci_dev *hdev,
BT_DBG("");
- return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
+ return user_pairing_resp(sk, hdev, &cp->addr,
MGMT_OP_USER_PASSKEY_NEG_REPLY,
HCI_OP_USER_PASSKEY_NEG_REPLY, 0);
}
--
1.7.10.4
next prev parent reply other threads:[~2013-03-15 22:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-15 22:06 [PATCH v5 00/26] Bluetooth: Management interface fixes Johan Hedberg
2013-03-15 22:06 ` [PATCH v5 01/26] Bluetooth: Move power on HCI command updates to their own function Johan Hedberg
2013-03-15 22:06 ` [PATCH v5 02/26] Bluetooth: Update mgmt powered HCI commands to use async requests Johan Hedberg
2013-03-15 22:06 ` [PATCH v5 03/26] Bluetooth: Wait for HCI command completion with mgmt_set_powered Johan Hedberg
2013-03-15 22:06 ` [PATCH v5 04/26] Bluetooth: Fix busy condition testing for EIR and class updates Johan Hedberg
2013-03-15 22:06 ` [PATCH v5 05/26] Bluetooth: Fix UUID/class mgmt command response synchronization Johan Hedberg
2013-03-15 22:06 ` [PATCH v5 06/26] Bluetooth: Remove useless HCI_PENDING_CLASS flag Johan Hedberg
2013-03-15 22:06 ` [PATCH v5 07/26] Bluetooth: Add a define for the HCI persistent flags mask Johan Hedberg
2013-03-15 22:06 ` [PATCH v5 08/26] Bluetooth: Clear non-persistent flags when closing HCI device Johan Hedberg
2013-03-15 22:06 ` [PATCH v5 09/26] Bluetooth: Fix clearing flags on power off before notifying mgmt Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 10/26] Bluetooth: Fix waiting for EIR update when setting local name Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 11/26] Bluetooth: Handle AD updating through an async request Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 12/26] Bluetooth: Fix local name setting for LE-only controllers Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 13/26] Bluetooth: Fix setting local name to the existing value Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 14/26] Bluetooth: Use an async request for mgmt_set_connectable Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 15/26] Bluetooth: Fix fast connectable response sending Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 16/26] Bluetooth: Limit fast connectable support to >= 1.2 controllers Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 17/26] Bluetooth: Fix error response for simultaneous fast connectable commands Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 18/26] Bluetooth: Add proper flag for fast connectable mode Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 19/26] Bluetooth: Refactor fast connectable HCI commands Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 20/26] Bluetooth: Disable fast connectable when disabling connectable Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 21/26] Bluetooth: Add reading of page scan parameters Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 22/26] Bluetooth: Update page scan parameters after successful write commands Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 23/26] Bluetooth: Fix updating page scan parameters when not necessary Johan Hedberg
2013-03-15 22:07 ` [PATCH v5 24/26] Bluetooth: Fix fast connectable state when enabling page scan Johan Hedberg
2013-03-15 22:07 ` Johan Hedberg [this message]
2013-03-15 22:07 ` [PATCH v5 26/26] Bluetooth: Fix PIN/Confirm/Passkey response parameters Johan Hedberg
2013-03-18 17:08 ` Gustavo Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363385236-25704-26-git-send-email-johan.hedberg@gmail.com \
--to=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox