diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2013-12-02 21:13:24 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-12-05 16:05:32 +0100 |
| commit | 6d3c15da1ddbffff2d0f50132a239209b2fa138e (patch) | |
| tree | 70c93eb12e8124cb388a8e27305ef6cc95ec0d17 | |
| parent | Bluetooth: Remove dead code from SMP encryption function (diff) | |
| download | linux-6d3c15da1ddbffff2d0f50132a239209b2fa138e.tar.xz linux-6d3c15da1ddbffff2d0f50132a239209b2fa138e.zip | |
Bluetooth: Remove unnecessary braces from one-line if-statement
This patch is just a trivial coding style fix to remove unnecessary
braces from a one-line if-statement.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 4af3821df880..70be2eb8ed03 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -6612,11 +6612,10 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) } if (chan->state == BT_CONNECT) { - if (!status) { + if (!status) l2cap_start_connection(chan); - } else { + else __set_chan_timer(chan, L2CAP_DISC_TIMEOUT); - } } else if (chan->state == BT_CONNECT2) { struct l2cap_conn_rsp rsp; __u16 res, stat; |