diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 15 | ||||
| -rw-r--r-- | net/wireless/Kconfig | 4 |
2 files changed, 8 insertions, 11 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index ee57fa20bac3..f07a2b11c3c9 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -726,20 +726,17 @@ static void create_le_conn_complete(struct hci_dev *hdev, u8 status, u16 opcode) hci_dev_lock(hdev); conn = hci_lookup_le_connect(hdev); + if (!conn) + goto done; if (!status) { hci_connect_le_scan_cleanup(conn); - goto done; + } else { + BT_ERR("HCI request failed to create LE connection: status 0x%2.2x", + status); + hci_le_conn_failed(conn, status); } - bt_dev_err(hdev, "request failed to create LE connection: " - "status 0x%2.2x", status); - - if (!conn) - goto done; - - hci_le_conn_failed(conn, status); - done: hci_dev_unlock(hdev); } diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index 211007c091d5..19959fb5df4e 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only config WIRELESS_EXT - bool + bool "WIRELESS_EXT - wireless core extensions" config WEXT_CORE def_bool y @@ -15,7 +15,7 @@ config WEXT_SPY bool config WEXT_PRIV - bool + bool "WEXT_PRIV - Wireless Extensions priv API" config CFG80211 tristate "cfg80211 - wireless configuration API" |