diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-20 06:08:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-20 06:08:27 -0700 |
| commit | 26440c835f8b1a491e2704118ac55bf87334366c (patch) | |
| tree | 3c2d23b59fd49b252fdbf6c09efc41b354933fc6 /net/bluetooth/hci_core.c | |
| parent | 371f1c7e0d854796adc622cc3bacfcc5fc638db1 (diff) | |
| parent | 1099f86044111e9a7807f09523e42d4c9d0fb781 (diff) | |
| download | linux-26440c835f8b1a491e2704118ac55bf87334366c.tar.gz linux-26440c835f8b1a491e2704118ac55bf87334366c.tar.bz2 linux-26440c835f8b1a491e2704118ac55bf87334366c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/asix_common.c
net/ipv4/inet_connection_sock.c
net/switchdev/switchdev.c
In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.
The other two conflicts were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index d2b3dd32d6cf..e4e53bd663df 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2930,13 +2930,6 @@ struct hci_conn_params *hci_explicit_connect_lookup(struct hci_dev *hdev, return param; } - list_for_each_entry(param, &hdev->pend_le_reports, action) { - if (bacmp(¶m->addr, addr) == 0 && - param->addr_type == addr_type && - param->explicit_connect) - return param; - } - return NULL; } |