diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-12-15 13:23:09 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-12-15 13:23:09 -0500 |
| commit | a463e9c57ac1f21e40bc8bff77a4de082ebc432e (patch) | |
| tree | b6f0ed4bde2227feb29f69d9312c14d528d754a5 /net/bluetooth/hci_conn.c | |
| parent | 67e2c3883828b39548cee2091b36656787775d95 (diff) | |
| parent | 9845904fd489288bcf693642c1b31cc463c0b660 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 79d84b88b8f0..fe18825cc8a4 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -661,7 +661,7 @@ static void hci_req_add_le_create_conn(struct hci_request *req, memset(&cp, 0, sizeof(cp)); /* Update random address, but set require_privacy to false so - * that we never connect with an unresolvable address. + * that we never connect with an non-resolvable address. */ if (hci_update_random_address(req, false, &own_addr_type)) return; |