[Bluez-users] bthid and 2.4.25-mh2

[Bluez-users] bthid and 2.4.25-mh2

[Michal Semler (volny.cz)]

Marcel,

there is 100% problem in mh2 patch. I tried downgrade to simple 2.4.25 and 
keyboard started working imeditially. Then tried upgrade to 2.4.25-mh2 and 
keyboard stopped working.

Michal


-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Bluez-users mailing list
Bluez-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-users

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

[Marcel Holtmann]

Hi Michal,

> there is 100% problem in mh2 patch. I tried downgrade to simple 2.4.25 and 
> keyboard started working imeditially. Then tried upgrade to 2.4.25-mh2 and 
> keyboard stopped working.

please check 2.4.25-mh1.

Regards

Marcel




-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Bluez-users mailing list
Bluez-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-users

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

[Michal Semler (volny.cz)]

Dne st 17. b=F8ezna 2004 13:15 jste napsal(a):
> Hi Michal,
>
> > there is 100% problem in mh2 patch. I tried downgrade to simple 2.4.25
> > and keyboard started working imeditially. Then tried upgrade to
> > 2.4.25-mh2 and keyboard stopped working.
>
> please check 2.4.25-mh1.

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 fin=
d=20
which "patch" in it si bad.

Michal

>
> Regards
>
> Marcel


-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Bluez-users mailing list
Bluez-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-users

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

[Marcel Holtmann]

[-- Attachment #1: Type: text/plain, Size: 295 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.

Regards

Marcel


[-- Attachment #2: patch-non-blocking-race --]
[-- Type: text/plain, Size: 2077 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/03/15 19:42:55+01:00 marcel@holtmann.org 
#   [Bluetooth] Fix non-blocking socket race conditions
#   
#   A poll on a non-blocking listen socket signals readable too early. The
#   first time the socket should be readable is if a child is in connected
#   state. And don't signal writeable if the socket is in config state.
#   
#   Noticed by Jean Tourrilhes <jt@hpl.hp.com>
# 
# net/bluetooth/af_bluetooth.c
#   2004/03/15 19:42:15+01:00 marcel@holtmann.org +22 -5
#   Fix non-blocking socket race conditions
# 
diff -Nru a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
--- a/net/bluetooth/af_bluetooth.c	Mon Mar 15 19:43:09 2004
+++ b/net/bluetooth/af_bluetooth.c	Mon Mar 15 19:43:09 2004
@@ -218,15 +218,31 @@
 	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;
-	unsigned int mask;
+	unsigned int mask = 0;
 
 	BT_DBG("sock %p, sk %p", sock, sk);
 
 	poll_wait(file, sk->sleep, wait);
-	mask = 0;
+
+	if (sk->state == BT_LISTEN)
+		return bluez_accept_poll(sk);
 
 	if (sk->err || !skb_queue_empty(&sk->error_queue))
 		mask |= POLLERR;
@@ -235,16 +251,17 @@
 		mask |= POLLHUP;
 
 	if (!skb_queue_empty(&sk->receive_queue) || 
-			!list_empty(&bluez_pi(sk)->accept_q) ||
 			(sk->shutdown & RCV_SHUTDOWN))
 		mask |= POLLIN | POLLRDNORM;
 
 	if (sk->state == BT_CLOSED)
 		mask |= POLLHUP;
 
-	if (sk->state == BT_CONNECT || sk->state == BT_CONNECT2)
+	if (sk->state == BT_CONNECT ||
+			sk->state == BT_CONNECT2 ||
+			sk->state == BT_CONFIG)
 		return mask;
-	
+
 	if (sock_writeable(sk))
 		mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
 	else

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

[Michal Semler (volny.cz)]

Dne =E8t 18. b=F8ezna 2004 21:34 Marcel Holtmann napsal(a):
> 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 :)

Michal

>
> Regards
>
> Marcel


-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Bluez-users mailing list
Bluez-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-users

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

[Marcel Holtmann]

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

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

[Michal Semler (volny.cz)]

Dne =E8t 18. b=F8ezna 2004 22:39 jste napsal(a):
> Hi Michal,

Hi Marcel

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

We both made the same patch and both of us were right :) I wanted rightly t=
o=20
send it to you :)

PLS apply :)

Michal

>
> Regards
>
> Marcel


-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Bluez-users mailing list
Bluez-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-users

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

[Marcel Holtmann]

Hi Michal,


> > I did a fixup for the -mh2, so please apply the attached patch on top of
> > a -mh2 and see if it still works.
> 
> We both made the same patch and both of us were right :) I wanted rightly to 
> send it to you :)

so I made a mistake in backporting the bluez_accept_poll() function from
2.6, but the second part for the writeable socket works.

Regards

Marcel




-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Bluez-users mailing list
Bluez-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-users

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

[Michal Semler (volny.cz)]

Nice to see it fixed... :)

It would be nice if other projects fix their bugs so quick :)
I think you, Marcel, are one of the best mainteiners :)

Michal

Dne =E8t 18. b=F8ezna 2004 23:29 Marcel Holtmann napsal(a):
> Hi Michal,
>
> > > I did a fixup for the -mh2, so please apply the attached patch on top
> > > of a -mh2 and see if it still works.
> >
> > We both made the same patch and both of us were right :) I wanted right=
ly
> > to send it to you :)
>
> so I made a mistake in backporting the bluez_accept_poll() function from
> 2.6, but the second part for the writeable socket works.
>
> Regards
>
> Marcel
>
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by: IBM Linux Tutorials
> Free Linux tutorial presented by Daniel Robbins, President and CEO of
> GenToo technologies. Learn everything from fundamentals to system
> administration.http://ads.osdn.com/?ad_id=3D1470&alloc_id=3D3638&op=3Dcli=
ck
> _______________________________________________
> Bluez-users mailing list
> Bluez-users@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/bluez-users


-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Bluez-users mailing list
Bluez-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-users

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

[Marcel Holtmann]

Hi Michal,

> It would be nice if other projects fix their bugs so quick :)
> I think you, Marcel, are one of the best mainteiners :)

thanks :)

I have a high priority on kernel bugs, but this means that the userspace
stuff has to wait. Actually we have so many outstanding patches for the
hcid from Fredrik and most of them should be integrated, but I didn't
found the time to review them. Sorry for that :(

Right now I have a very big problem with Bluetooth and a 2.6 kernel on
the sparc64 platform. I have no idea what's going wrong, but every 2.4
works like a charm. Do anyone have this combination running?

Regards

Marcel




-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Bluez-users mailing list
Bluez-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-users