Re: [Bluez-users] bthid and 2.4.25-mh2

[Marcel Holtmann <marcel@holtmann.org>]

[-- Attachment #1: Type: text/plain, Size: 465 bytes --]

Hi Michal,

> > > Works without problem :) Maybe "Patch day" was not so patch :D
> > > Marcel send me in privat your mh2 patch differenced into parts and I'll
> > > find which "patch" in it si bad.
> >
> > I think it can be only this one. Please apply -mh2 and apply the
> > attached patch with -R.
> 
> That is the one :) Now it works :)

I did a fixup for the -mh2, so please apply the attached patch on top of
a -mh2 and see if it still works.

Regards

Marcel


[-- Attachment #2: patch-fix-mh2 --]
[-- Type: text/x-patch, Size: 1191 bytes --]

diff -urN linux-2.4.25-mh2/net/bluetooth/af_bluetooth.c linux-2.4.25-mh2-fix/net/bluetooth/af_bluetooth.c
--- linux-2.4.25-mh2/net/bluetooth/af_bluetooth.c	2004-03-18 22:29:38.000000000 +0100
+++ linux-2.4.25-mh2-fix/net/bluetooth/af_bluetooth.c	2004-03-18 22:32:55.000000000 +0100
@@ -218,20 +218,6 @@
 	return err ? : copied;
 }
 
-static inline unsigned int bluez_accept_poll(struct sock *parent)
-{
-	struct list_head *p, *n;
-	struct sock *sk;
-
-	list_for_each_safe(p, n, &bluez_pi(parent)->accept_q) {
-		sk = (struct sock *) list_entry(p, struct bluez_pinfo, accept_q);
-		if (sk->state == BT_CONNECTED)
-			return POLLIN | POLLRDNORM;
-	}
-
-	return 0;
-}
-
 unsigned int bluez_sock_poll(struct file * file, struct socket *sock, poll_table *wait)
 {
 	struct sock *sk = sock->sk;
@@ -241,9 +227,6 @@
 
 	poll_wait(file, sk->sleep, wait);
 
-	if (sk->state == BT_LISTEN)
-		return bluez_accept_poll(sk);
-
 	if (sk->err || !skb_queue_empty(&sk->error_queue))
 		mask |= POLLERR;
 
@@ -251,6 +234,7 @@
 		mask |= POLLHUP;
 
 	if (!skb_queue_empty(&sk->receive_queue) || 
+			!list_empty(&bluez_pi(sk)->accept_q) ||
 			(sk->shutdown & RCV_SHUTDOWN))
 		mask |= POLLIN | POLLRDNORM;