Bluetooth: Simplify logic when checking SMP_FLAG_TK_VALID
authorJohan Hedberg <johan.hedberg@intel.com>
Wed, 19 Mar 2014 12:14:51 +0000 (14:14 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 19 Mar 2014 20:55:05 +0000 (13:55 -0700)
This is a trivial coding style simplification by instead of having an
extra early return to instead revert the if condition and do the single
needed queue_work() call there.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/smp.c

index a0150033e797b732801688d9e6ff95b86b09d88e..ed1c9547ba6e637678fb2a45d491ced91b47cb59 100644 (file)
@@ -761,10 +761,8 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)
        set_bit(SMP_FLAG_CFM_PENDING, &smp->smp_flags);
 
        /* Can't compose response until we have been confirmed */
-       if (!test_bit(SMP_FLAG_TK_VALID, &smp->smp_flags))
-               return 0;
-
-       queue_work(hdev->workqueue, &smp->confirm);
+       if (test_bit(SMP_FLAG_TK_VALID, &smp->smp_flags))
+               queue_work(hdev->workqueue, &smp->confirm);
 
        return 0;
 }