Hi Johan, On Thu, May 5, 2011 at 5:34 AM, Johan Hedberg <johan.hedberg@xxxxxxxxx> wrote: > Hi Claudio, > > On Tue, May 03, 2011, Claudio Takahasi wrote: >> This patch series is the first step to cleanup the device discovery >> procedure. The main changes are: >>  - Unify advertising reports and inquiry results: mgmt sends >>   one device found event >>  - Logic improvement/cleanup: device found >>  - Move EIR functions to a new file >>  - Add BDADDR type constants: necessary L2CAP connections and bonding >> >> >> >> Bruna Moreira (3): >>  Remove btd_event_advertising_report >>  Replace EIR_DATA_LENGTH with HCI_MAX_EIR_LENGTH >>  Drop variable EIR length >> >> Claudio Takahasi (10): >>  Move EIR related functions to a new file >>  Add Bluetooth address type definition >>  Initial device found cleanup >>  Move legacy verification to a new function >>  Cleanup read name and alias from storage >>  Don't resolve name if the name is in the storage >>  Unify inquiry results and advertises >>  Fix memory leak of EIR data >>  Change the order to write/read the remote's name >>  Cleanup inserting new device found entry >> >> ÂMakefile.am    |  Â2 +- >> Âlib/bluetooth.h  |  Â4 + >> Âplugins/hciops.c Â| Â202 +++++---------------------------- >> Âplugins/mgmtops.c |  Â3 +- >> Âsrc/adapter.c   | Â182 +++++++++++++++++++----------- >> Âsrc/adapter.h   |  Â9 +- >> Âsrc/eir.c     | Â328 +++++++++++++++++++++++++++++++++++++++++++++++++++++ >> Âsrc/eir.h     |  41 +++++++ >> Âsrc/event.c    | Â224 +----------------------------------- >> Âsrc/event.h    |  Â5 +- >> Âsrc/sdpd.h    Â|  14 --- >> Â11 files changed, 530 insertions(+), 484 deletions(-) >> Âcreate mode 100644 src/eir.c >> Âcreate mode 100644 src/eir.h > > These patches don't seem to apply any more after I applied AndrÃs > patches. (also, I can't really try applying anything else except 1/13 > since 2/13 is already the address type patch which is still being > discussed). > > Johan > I am aware of this conflict. Patches are already rebased, but I will wait Marcel's blessing(for the address type) before to send again the patch series. BR, Claudio. -- 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