aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-03-24 10:59:14 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-03-24 11:43:50 -0400
commit8396215d4865d66be9cdfcec8d135862e1fd98d1 (patch)
tree6e0d687f9ecbe13767549ba1bec78bb49a811d0a
parent61b3b2b6f4d754aaa84606e041556369bb5a107b (diff)
Bluetooth: Remove unnecessary assignment in SMP
The smp variable in smp_conn_security is not used anywhere before the smp = smp_chan_create() call in the smp_conn_security function so it makes no sense to assign any other value to it before that. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/bluetooth/smp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index c654c5880912..dfb4e1161c10 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -889,8 +889,6 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)
889 if (!conn) 889 if (!conn)
890 return 1; 890 return 1;
891 891
892 smp = conn->smp_chan;
893
894 if (!test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags)) 892 if (!test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags))
895 return 1; 893 return 1;
896 894