Re: Linux 2.6.39.1

Jiri Kosina
2011-06-12T22:11:08Z

On Wed, 8 Jun 2011, Gustavo F. Padovan wrote:

> > > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> > > index 19cd4af..86d1e26 100644
> > > --- a/net/bluetooth/hci_event.c
> > > +++ b/net/bluetooth/hci_event.c
> > > @@ -477,14 +477,16 @@ static void hci_setup_event_mask(struct hci_dev *hdev)
> > > * command otherwise */
> > > u8 events[8] = { 0xff, 0xff, 0xfb, 0xff, 0x00, 0x00, 0x00, 0x00 };
> > >
> > > - /* Events for 1.2 and newer controllers */
> > > - if (hdev->lmp_ver > 1) {
> > > - events[4] |= 0x01; /* Flow Specification Complete */
> > > - events[4] |= 0x02; /* Inquiry Result with RSSI */
> > > - events[4] |= 0x04; /* Read Remote Extended Features Complete */
> > > - events[5] |= 0x08; /* Synchronous Connection Complete */
> > > - events[5] |= 0x10; /* Synchronous Connection Changed */
> > > - }
> > > + /* CSR 1.1 dongles does not accept any bitfield so don't try to set
> > > + * any event mask for pre 1.2 devices */
> > > + if (hdev->lmp_ver <= 1)
> > > + return;
> > > +
> > > + events[4] |= 0x01; /* Flow Specification Complete */
> > > + events[4] |= 0x02; /* Inquiry Result with RSSI */
> > > + events[4] |= 0x04; /* Read Remote Extended Features Complete */
> > > + events[5] |= 0x08; /* Synchronous Connection Complete */
> > > + events[5] |= 0x10; /* Synchronous Connection Changed */
> > >
> > > if (hdev->features[3] & LMP_RSSI_INQ)
> > > events[4] |= 0x04; /* Inquiry Result with RSSI */
> >
> > Where did this patch come from? I don't see it in Linus' tree. If this
> > patch is merged, I can test the a new kernel out to see if we should
> > back out the commit from Jiri. However, right now my magic trackpad
> > (which has the same issue as the magic mouse) works fine on plain 2.6.39.1.
>
> This patch is in my tree. It will be on its way to Linus' tree today.

Doesn't seem to be present in Linus' tree as of today. Has there been any
issue discovered in the meantime?

Thanks,

--
Jiri Kosina
SUSE Labs