Commit ddcd0f41 authored May 31, 2012 by Vinicius Costa Gomes Committed by Johan Hedberg Jun 05, 2012

Bluetooth: Fix checking the wrong flag when accepting a socket



Most probably a typo, the check should have been for BT_SK_DEFER_SETUP
instead of BT_DEFER_SETUP (which right now only represents a socket
option).

Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent fcb6ff5e

net/bluetooth/af_bluetooth.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,7 @@ struct sock bt_accept_dequeue(struct sock parent, struct socket *newsock)
		}

		if (sk->sk_state == BT_CONNECTED \|\| !newsock \|\|
		test_bit(BT_DEFER_SETUP, &bt_sk(parent)->flags)) {
		test_bit(BT_SK_DEFER_SETUP, &bt_sk(parent)->flags)) {
		bt_accept_unlink(sk);
		if (newsock)
		sock_graft(sk, newsock);