From 2cae9fe13f7f9f1ca21adfc3649b5180bdb2cb08 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 16 Feb 2009 02:57:30 +0100 Subject: [PATCH] --- yaml --- r: 134740 b: refs/heads/master c: d5f2d2be68876f65dd051b978a7b66265fde9ffd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bluetooth/af_bluetooth.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9bcdb1dab5ef..f514479bdb30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96a3183322cba1a2846771b067c99b9d6f481263 +refs/heads/master: d5f2d2be68876f65dd051b978a7b66265fde9ffd diff --git a/trunk/net/bluetooth/af_bluetooth.c b/trunk/net/bluetooth/af_bluetooth.c index ded57974390e..02b9baa1930b 100644 --- a/trunk/net/bluetooth/af_bluetooth.c +++ b/trunk/net/bluetooth/af_bluetooth.c @@ -270,12 +270,11 @@ static inline unsigned int bt_accept_poll(struct sock *parent) struct list_head *p, *n; struct sock *sk; - if (bt_sk(parent)->defer_setup) - return POLLIN | POLLRDNORM; - list_for_each_safe(p, n, &bt_sk(parent)->accept_q) { sk = (struct sock *) list_entry(p, struct bt_sock, accept_q); - if (sk->sk_state == BT_CONNECTED) + if (sk->sk_state == BT_CONNECTED || + (bt_sk(parent)->defer_setup && + sk->sk_state == BT_CONNECT2)) return POLLIN | POLLRDNORM; }