[ adding Linus to CC ... would be good to have this fixed before 3.0-final
indeed ]
On Fri, 15 Jul 2011, Ed Tomlinson wrote:
> > > I booted to todays linux git and bluetooth is no longer working.
> > > My magic mouse will not connect correctly.
> > >
> > > Reverting:
> > >
> > > commit 9fa7e4f76f3658ba1f44fbdb95c77e7df3f53f95
> > > Author: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
> > > Date: Thu Jun 30 16:11:30 2011 -0300
> > >
> > > Bluetooth: Fix regression with incoming L2CAP connections
> > >
> > > PTS test A2DP/SRC/SRC_SET/TC_SRC_SET_BV_02_I revealed that
> > > ( probably after the df3c3931e commit ) the l2cap connection
> > > could not be established in case when the "Auth Complete" HCI
> > > event does not arive before the initiator send "Configuration
> > > request", in which case l2cap replies with "Command rejected"
> > > since the channel is still in BT_CONNECT2 state.
> > >
> > > Based on patch from: Ilia Kolomisnky <iliak@xxxxxx>
> > >
> > > Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
> > >
> > > Fixes the bug here (things work like rc7).
> > >
> > > Do we really need 9fa7e4f76f3658ba1f44fbdb95c77e7df3f53f95 in 3.0?
> > >
> > > Thanks,
> > >
> > > Ed Tomlinson
> > > --
> >
> > I've changed the check to something like this:
> >
> > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> > index ebff14c..f88b9c8 100644
> > --- a/net/bluetooth/l2cap_core.c
> > +++ b/net/bluetooth/l2cap_core.c
> > @@ -2323,8 +2323,7 @@ static inline int l2cap_config_req(struct
> > l2cap_conn *conn, struct l2cap_cmd_hdr
> >
> > sk = chan->sk;
> >
> > - if ((bt_sk(sk)->defer_setup && sk->sk_state != BT_CONNECT2) ||
> > - (!bt_sk(sk)->defer_setup && sk->sk_state != BT_CONFIG)) {
> > + if ((sk->sk_state != BT_CONNECT2) && (sk->sk_state != BT_CONFIG)) {
> > struct l2cap_cmd_rej rej;
> >
> > rej.reason = cpu_to_le16(0x0002);
> >
> > Seems to work fine.
>
> And here too. You can can my tested by
>
> Tested By: Ed Tomlinson <edt@xxxxxx>
>
> IMHO this should be in 3.0.0
>
> Thanks!
> Ed Tomlinson
Luiz,
could you please repost the patch with proper changelog and your
Signed-off-by, so that it could (hopefully) be applied for 3.0 still?
Thanks,
--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
