Return-Path: MIME-Version: 1.0 In-Reply-To: <2d5a2c100906221608v5e3e3d8aydf66b13826ad88fa@mail.gmail.com> References: <2d5a2c100906090617m167d3815pae998d06bdbd6646@mail.gmail.com> <2d5a2c100906210708x1816e5d9hb9a80c82d76da6dd@mail.gmail.com> <1245595707.15367.66.camel@violet> <2d5a2c100906210930q394fcf77hcd2bf39c26ae74f8@mail.gmail.com> <1245603529.15367.68.camel@violet> <2d5a2c100906211047n31b9d4dajac290601c184380b@mail.gmail.com> <1245611096.15367.76.camel@violet> <2d5a2c100906221449y6e37cb19x1bc27085bac318f4@mail.gmail.com> <2d5a2c100906221608v5e3e3d8aydf66b13826ad88fa@mail.gmail.com> Date: Tue, 23 Jun 2009 10:51:43 -0300 Message-ID: <2d5a2c100906230651m679ccfat5bf4bfb20c130955@mail.gmail.com> Subject: Re: regression introduced on v2.6.30-rc1 From: Luiz Augusto von Dentz To: Marcel Holtmann Cc: linux-bluetooth@vger.kernel.org Content-Type: multipart/mixed; boundary=0016364ee3167c4bde046d044a40 List-ID: --0016364ee3167c4bde046d044a40 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cleanup version, which include code style fixing suggested by Johan on irc. There are 2 other things that comes to my mind that need discussing: - 20 sec timeout is perhaps too big - clear the timer on rfcomm_session_close is perhaps not save then we can move it to rfcomm_session_del --=20 Luiz Augusto von Dentz Engenheiro de Computa=E7=E3o --0016364ee3167c4bde046d044a40 Content-Type: text/x-diff; charset=US-ASCII; name="0001-bluetooth-Fix-rejected-connection-to-not-disconnect-.patch" Content-Disposition: attachment; filename="0001-bluetooth-Fix-rejected-connection-to-not-disconnect-.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fwao8k2b1 RnJvbSA3ODFjM2RmNWQwOTI2YWFhNTE3Y2Y4NDViYWY3MWRjMGU1NzIwZDgxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEF1Z3VzdG8gdm9uIERlbnR6IDxsdWl6LmRlbnR6QG9w ZW5ib3NzYS5vcmc+CkRhdGU6IFR1ZSwgMjMgSnVuIDIwMDkgMTA6MzE6NTcgLTAzMDAKU3ViamVj dDogW1BBVENIXSBibHVldG9vdGg6IEZpeCByZWplY3RlZCBjb25uZWN0aW9uIHRvIG5vdCBkaXNj b25uZWN0IEFDTC4KCldoZW4gdXNpbmcgREVGRVJfU0VUVVAgb24gYSBSRkNPTU0gc29ja2V0IGEg U0FCTSBmcmFtZSB0cmlnZ2VycwphdXRob3JpemF0aW9uIHdoaWNoIHdoZW4gcmVqZWN0ZWQgc2Vu ZCBhIERNIGFzIHJlc3BvbnNlLiBUaGlzIGlzIGZpbmUKYWNjb3VyZGluZyB0byB0aGUgUkZDT01N IHNwZWM6CgoidGhlIHJlc3BvbmRpbmcgaW1wbGVtZW50YXRpb24gbWF5IHJlcGxhY2UgdGhlICJw cm9wZXIiIHJlc3BvbnNlIG9uCnRoZSBNdWx0aXBsZXhlciBDb250cm9sIGNoYW5uZWwgd2l0aCBh IERNIGZyYW1lLCBzZW50IG9uIHRoZSByZWZlcmVuY2VkCkRMQ0kgdG8gaW5kaWNhdGUgdGhhdCB0 aGUgRExDSSBpcyBub3Qgb3BlbiwgYW5kIHRoYXQgdGhlIHJlc3BvbmRlciB3b3VsZApub3QgZ3Jh bnQgYSByZXF1ZXN0IHRvIG9wZW4gaXQgbGF0ZXIgZWl0aGVyLiIKCkJ1dCBzb21lIHN0YWNrcyBk b2Vzbid0IHNlZW1zIHRvIGNvcGUgd2l0aCB0aGlzIGxlYXZpbmcgRExDSSAwIG9wZW4gYWZ0ZXIK cmVjZWl2aW5nIERNIGZyYW1lLgoKVG8gZml4IGl0IHByb3Blcmx5IGEgdGltZXIgd2FzIGludHJv ZHVjZWQgdG8gcmZjb21tX3Nlc3Npb24gd2hpY2ggaXMgdXNlZAp0byBzZXQgYSB0aW1lb3V0IHdo ZW4gdGhlIGxhc3QgYWN0aXZlIERMQyBvZiBhIHNlc3Npb24gaXMgdW5saW5rZWQsIHRoaXMKd2ls bCBnaXZlIHRoZSByZW1vdGUgc3RhY2sgc29tZSB0aW1lIHRvIHJlcGx5IHdpdGggYSBwcm9wZXIg RElTQyBmcmFtZSBvbgpETENJIDAgYXZvaWRpbmcgYm90aCBzaWRlcyBzZW5kaW5nIERJU0MgdG8g ZWFjaCBvdGhlciBvbiBzdGFja3MgdGhhdApmb2xsb3cgdGhlIHNwZWNpZmljYXRpb24gYW5kIHRh a2luZyBjYXJlIG9mIHRob3NlIHdobyBkb24ndCBieSB0YWtpbmcKZG93biBETENJIDAuCgpTaWdu ZWQtb2ZmLWJ5OiBMdWl6IEF1Z3VzdG8gdm9uIERlbnR6IDxsdWl6LmRlbnR6QG9wZW5ib3NzYS5v cmc+Ci0tLQogaW5jbHVkZS9uZXQvYmx1ZXRvb3RoL3JmY29tbS5oIHwgICAgMSArCiBuZXQvYmx1 ZXRvb3RoL3JmY29tbS9jb3JlLmMgICAgfCAgIDM5ICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCAwIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbmV0L2JsdWV0b290aC9yZmNvbW0uaCBiL2lu Y2x1ZGUvbmV0L2JsdWV0b290aC9yZmNvbW0uaAppbmRleCA4MDA3MjYxLi5hMzI4ODNmIDEwMDY0 NAotLS0gYS9pbmNsdWRlL25ldC9ibHVldG9vdGgvcmZjb21tLmgKKysrIGIvaW5jbHVkZS9uZXQv Ymx1ZXRvb3RoL3JmY29tbS5oCkBAIC0xNTQsNiArMTU0LDcgQEAgc3RydWN0IHJmY29tbV9tc2Mg ewogc3RydWN0IHJmY29tbV9zZXNzaW9uIHsKIAlzdHJ1Y3QgbGlzdF9oZWFkIGxpc3Q7CiAJc3Ry dWN0IHNvY2tldCAgICpzb2NrOworCXN0cnVjdCB0aW1lcl9saXN0IHRpbWVyOwogCXVuc2lnbmVk IGxvbmcgICAgc3RhdGU7CiAJdW5zaWduZWQgbG9uZyAgICBmbGFnczsKIAlhdG9taWNfdCAgICAg ICAgIHJlZmNudDsKZGlmZiAtLWdpdCBhL25ldC9ibHVldG9vdGgvcmZjb21tL2NvcmUuYyBiL25l dC9ibHVldG9vdGgvcmZjb21tL2NvcmUuYwppbmRleCAzNzQ1MzZlLi43MzAzNWI2IDEwMDY0NAot LS0gYS9uZXQvYmx1ZXRvb3RoL3JmY29tbS9jb3JlLmMKKysrIGIvbmV0L2JsdWV0b290aC9yZmNv bW0vY29yZS5jCkBAIC0yNDQsNiArMjQ0LDMzIEBAIHN0YXRpYyBpbmxpbmUgaW50IHJmY29tbV9j aGVja19zZWN1cml0eShzdHJ1Y3QgcmZjb21tX2RsYyAqZCkKIAkJCQkJCQkJYXV0aF90eXBlKTsK IH0KIAorc3RhdGljIHZvaWQgcmZjb21tX3Nlc3Npb25fdGltZW91dCh1bnNpZ25lZCBsb25nIGFy ZykKK3sKKwlzdHJ1Y3QgcmZjb21tX3Nlc3Npb24gKnMgPSAodm9pZCAqKSBhcmc7CisKKwlCVF9E QkcoInNlc3Npb24gJXAgc3RhdGUgJWxkIiwgcywgcy0+c3RhdGUpOworCisJc2V0X2JpdChSRkNP TU1fVElNRURfT1VULCAmcy0+ZmxhZ3MpOworCXJmY29tbV9zZXNzaW9uX3B1dChzKTsKKwlyZmNv bW1fc2NoZWR1bGUoUkZDT01NX1NDSEVEX1RJTUVPKTsKK30KKworc3RhdGljIHZvaWQgcmZjb21t X3Nlc3Npb25fc2V0X3RpbWVyKHN0cnVjdCByZmNvbW1fc2Vzc2lvbiAqcywgbG9uZyB0aW1lb3V0 KQoreworCUJUX0RCRygic2Vzc2lvbiAlcCBzdGF0ZSAlbGQgdGltZW91dCAlbGQiLCBzLCBzLT5z dGF0ZSwgdGltZW91dCk7CisKKwlpZiAoIW1vZF90aW1lcigmcy0+dGltZXIsIGppZmZpZXMgKyB0 aW1lb3V0KSkKKwkJcmZjb21tX3Nlc3Npb25faG9sZChzKTsKK30KKworc3RhdGljIHZvaWQgcmZj b21tX3Nlc3Npb25fY2xlYXJfdGltZXIoc3RydWN0IHJmY29tbV9zZXNzaW9uICpzKQoreworCUJU X0RCRygic2Vzc2lvbiAlcCBzdGF0ZSAlbGQiLCBzLCBzLT5zdGF0ZSk7CisKKwlpZiAodGltZXJf cGVuZGluZygmcy0+dGltZXIpICYmIGRlbF90aW1lcigmcy0+dGltZXIpKQorCQlyZmNvbW1fc2Vz c2lvbl9wdXQocyk7Cit9CisKIC8qIC0tLS0gUkZDT01NIERMQ3MgLS0tLSAqLwogc3RhdGljIHZv aWQgcmZjb21tX2RsY190aW1lb3V0KHVuc2lnbmVkIGxvbmcgYXJnKQogewpAQCAtMzIwLDYgKzM0 Nyw3IEBAIHN0YXRpYyB2b2lkIHJmY29tbV9kbGNfbGluayhzdHJ1Y3QgcmZjb21tX3Nlc3Npb24g KnMsIHN0cnVjdCByZmNvbW1fZGxjICpkKQogCiAJcmZjb21tX3Nlc3Npb25faG9sZChzKTsKIAor CXJmY29tbV9zZXNzaW9uX2NsZWFyX3RpbWVyKHMpOwogCXJmY29tbV9kbGNfaG9sZChkKTsKIAls aXN0X2FkZCgmZC0+bGlzdCwgJnMtPmRsY3MpOwogCWQtPnNlc3Npb24gPSBzOwpAQCAtMzM1LDYg KzM2Myw5IEBAIHN0YXRpYyB2b2lkIHJmY29tbV9kbGNfdW5saW5rKHN0cnVjdCByZmNvbW1fZGxj ICpkKQogCWQtPnNlc3Npb24gPSBOVUxMOwogCXJmY29tbV9kbGNfcHV0KGQpOwogCisJaWYgKGxp c3RfZW1wdHkoJnMtPmRsY3MpKQorCQlyZmNvbW1fc2Vzc2lvbl9zZXRfdGltZXIocywgUkZDT01N X0RJU0NfVElNRU9VVCk7CisKIAlyZmNvbW1fc2Vzc2lvbl9wdXQocyk7CiB9CiAKQEAgLTU2Nyw2 ICs1OTgsOCBAQCBzdGF0aWMgc3RydWN0IHJmY29tbV9zZXNzaW9uICpyZmNvbW1fc2Vzc2lvbl9h ZGQoc3RydWN0IHNvY2tldCAqc29jaywgaW50IHN0YXRlKQogCiAJQlRfREJHKCJzZXNzaW9uICVw IHNvY2sgJXAiLCBzLCBzb2NrKTsKIAorCXNldHVwX3RpbWVyKCZzLT50aW1lciwgcmZjb21tX3Nl c3Npb25fdGltZW91dCwgKHVuc2lnbmVkIGxvbmcpcyk7CisKIAlJTklUX0xJU1RfSEVBRCgmcy0+ ZGxjcyk7CiAJcy0+c3RhdGUgPSBzdGF0ZTsKIAlzLT5zb2NrICA9IHNvY2s7CkBAIC02MzksNiAr NjcyLDcgQEAgc3RhdGljIHZvaWQgcmZjb21tX3Nlc3Npb25fY2xvc2Uoc3RydWN0IHJmY29tbV9z ZXNzaW9uICpzLCBpbnQgZXJyKQogCQlfX3JmY29tbV9kbGNfY2xvc2UoZCwgZXJyKTsKIAl9CiAK KwlyZmNvbW1fc2Vzc2lvbl9jbGVhcl90aW1lcihzKTsKIAlyZmNvbW1fc2Vzc2lvbl9wdXQocyk7 CiB9CiAKQEAgLTE4NzksNiArMTkxMywxMSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgcmZjb21tX3By b2Nlc3Nfc2Vzc2lvbnModm9pZCkKIAkJc3RydWN0IHJmY29tbV9zZXNzaW9uICpzOwogCQlzID0g bGlzdF9lbnRyeShwLCBzdHJ1Y3QgcmZjb21tX3Nlc3Npb24sIGxpc3QpOwogCisJCWlmICh0ZXN0 X2JpdChSRkNPTU1fVElNRURfT1VULCAmcy0+ZmxhZ3MpKSB7CisJCQlyZmNvbW1fc2Vzc2lvbl9w dXQocyk7CisJCQljb250aW51ZTsKKwkJfQorCiAJCWlmIChzLT5zdGF0ZSA9PSBCVF9MSVNURU4p IHsKIAkJCXJmY29tbV9hY2NlcHRfY29ubmVjdGlvbihzKTsKIAkJCWNvbnRpbnVlOwotLSAKMS42 LjMuMQoK --0016364ee3167c4bde046d044a40--