diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2013-04-29 14:23:10 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-04-29 14:34:19 +0300 |
| commit | 109bd7f769f3bd10a4e9f581ab613ad814b73b2a (patch) | |
| tree | e8b8a7ef80083a7736dfcb450508e260f4e212b0 | |
| parent | 1c6880f26fe7e44d139bca984f3adecb300ca66d (diff) | |
| download | bluetooth-next-109bd7f769f3bd10a4e9f581ab613ad814b73b2a.tar.gz | |
Bluetooth: Remove useless hci_conn disc_timeout setting
There's no need to reset disc_timeout in l2cap_le_conn_ready since
HCI_DISCONN_TIMEOUT is the default when the hci_conn is created and
there should be no way for it to get changed between creation and
l2cap_le_conn_ready being called.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index eecb60f5263d7..13c1c77ec909f 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1363,8 +1363,6 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) chan->dcid = L2CAP_CID_LE_ATT; - conn->hcon->disc_timeout = HCI_DISCONN_TIMEOUT; - bacpy(&bt_sk(chan->sk)->src, conn->src); bacpy(&bt_sk(chan->sk)->dst, conn->dst); |