From: Johan Hedberg <johan.hedberg@intel.com>
Date: Mon, 24 Mar 2014 14:59:14 +0000 (+0200)
Subject: Bluetooth: Remove unnecessary assignment in SMP
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8396215d4865d66be9cdfcec8d135862e1fd98d1;p=deliverable%2Flinux.git

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>
---

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)
 	if (!conn)
 		return 1;
 
-	smp = conn->smp_chan;
-
 	if (!test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags))
 		return 1;