* [Bluez-devel] [PATCH 14/14] net/bluetooth/hci_core.c: Use time_* macros @ 2008-02-14 15:36 ` S.Çağlar Onur 0 siblings, 0 replies; 7+ messages in thread From: S.Çağlar Onur @ 2008-02-14 15:36 UTC (permalink / raw) To: linux-kernel; +Cc: S.Çağlar Onur, bluez-devel VGhlIGZ1bmN0aW9ucyB0aW1lX2JlZm9yZSwgdGltZV9iZWZvcmVfZXEsIHRpbWVfYWZ0ZXIsIGFu ZCB0aW1lX2FmdGVyX2VxIGFyZSBtb3JlIHJvYnVzdCBmb3IgY29tcGFyaW5nIGppZmZpZXMgYWdh aW5zdCBvdGhlciB2YWx1ZXMuCgpTbyBmb2xsb3dpbmcgcGF0Y2ggaW1wbGVtZW50cyB1c2FnZSBv ZiB0aGUgdGltZV9hZnRlcigpIG1hY3JvLCBkZWZpbmVkIGF0IGxpbnV4L2ppZmZpZXMuaCwgd2hp Y2ggZGVhbHMgd2l0aCB3cmFwcGluZyBjb3JyZWN0bHkKCkNjOiBibHVlei1kZXZlbEBsaXN0cy5z Zi5uZXQKU2lnbmVkLW9mZi1ieTogUy7Dh2HEn2xhciBPbnVyIDxjYWdsYXJAcGFyZHVzLm9yZy50 cj4KLS0tCiBuZXQvYmx1ZXRvb3RoL2hjaV9jb3JlLmMgfCAgICA1ICsrKy0tCiAxIGZpbGVzIGNo YW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9uZXQv Ymx1ZXRvb3RoL2hjaV9jb3JlLmMgYi9uZXQvYmx1ZXRvb3RoL2hjaV9jb3JlLmMKaW5kZXggMzcy YjBkMy4uOTMwYjU4ZSAxMDA2NDQKLS0tIGEvbmV0L2JsdWV0b290aC9oY2lfY29yZS5jCisrKyBi L25ldC9ibHVldG9vdGgvaGNpX2NvcmUuYwpAQCAtMjQsNiArMjQsNyBAQAogCiAvKiBCbHVldG9v dGggSENJIGNvcmUuICovCiAKKyNpbmNsdWRlIDxsaW51eC9qaWZmaWVzLmg+CiAjaW5jbHVkZSA8 bGludXgvbW9kdWxlLmg+CiAjaW5jbHVkZSA8bGludXgva21vZC5oPgogCkBAIC0xMzIxLDcgKzEz MjIsNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaGNpX3NjaGVkX2FjbChzdHJ1Y3QgaGNpX2RldiAq aGRldikKIAlpZiAoIXRlc3RfYml0KEhDSV9SQVcsICZoZGV2LT5mbGFncykpIHsKIAkJLyogQUNM IHR4IHRpbWVvdXQgbXVzdCBiZSBsb25nZXIgdGhhbiBtYXhpbXVtCiAJCSAqIGxpbmsgc3VwZXJ2 aXNpb24gdGltZW91dCAoNDAuOSBzZWNvbmRzKSAqLwotCQlpZiAoIWhkZXYtPmFjbF9jbnQgJiYg KGppZmZpZXMgLSBoZGV2LT5hY2xfbGFzdF90eCkgPiAoSFogKiA0NSkpCisJCWlmICghaGRldi0+ YWNsX2NudCAmJiB0aW1lX2FmdGVyKGppZmZpZXMsIGhkZXYtPmFjbF9sYXN0X3R4ICsgSFogKiA0 NSkpCiAJCQloY2lfYWNsX3R4X3RvKGhkZXYpOwogCX0KIApAQCAtMTU0Myw3ICsxNTQ0LDcgQEAg c3RhdGljIHZvaWQgaGNpX2NtZF90YXNrKHVuc2lnbmVkIGxvbmcgYXJnKQogCiAJQlRfREJHKCIl cyBjbWQgJWQiLCBoZGV2LT5uYW1lLCBhdG9taWNfcmVhZCgmaGRldi0+Y21kX2NudCkpOwogCi0J aWYgKCFhdG9taWNfcmVhZCgmaGRldi0+Y21kX2NudCkgJiYgKGppZmZpZXMgLSBoZGV2LT5jbWRf bGFzdF90eCkgPiBIWikgeworCWlmICghYXRvbWljX3JlYWQoJmhkZXYtPmNtZF9jbnQpICYmIHRp bWVfYWZ0ZXIoamlmZmllcywgaGRldi0+Y21kX2xhc3RfdHggKyBIWikpIHsKIAkJQlRfRVJSKCIl cyBjb21tYW5kIHR4IHRpbWVvdXQiLCBoZGV2LT5uYW1lKTsKIAkJYXRvbWljX3NldCgmaGRldi0+ Y21kX2NudCwgMSk7CiAJfQotLSAKMS41LjMuNwoKCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KVGhpcyBTRi5u ZXQgZW1haWwgaXMgc3BvbnNvcmVkIGJ5OiBNaWNyb3NvZnQKRGVmeSBhbGwgY2hhbGxlbmdlcy4g TWljcm9zb2Z0KFIpIFZpc3VhbCBTdHVkaW8gMjAwOC4KaHR0cDovL2Nsay5hdGRtdC5jb20vTVJU L2dvL3ZzZTAxMjAwMDAwNzBtcnQvZGlyZWN0LzAxLwpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpCbHVlei1kZXZlbCBtYWlsaW5nIGxpc3QKQmx1ZXotZGV2 ZWxAbGlzdHMuc291cmNlZm9yZ2UubmV0Cmh0dHBzOi8vbGlzdHMuc291cmNlZm9yZ2UubmV0L2xp c3RzL2xpc3RpbmZvL2JsdWV6LWRldmVsCg== ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 14/14] net/bluetooth/hci_core.c: Use time_* macros @ 2008-02-14 15:36 ` S.Çağlar Onur 0 siblings, 0 replies; 7+ messages in thread From: S.Çağlar Onur @ 2008-02-14 15:36 UTC (permalink / raw) To: linux-kernel; +Cc: bluez-devel, S.Çağlar Onur The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly Cc: bluez-devel@lists.sf.net Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr> --- net/bluetooth/hci_core.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 372b0d3..930b58e 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -24,6 +24,7 @@ /* Bluetooth HCI core. */ +#include <linux/jiffies.h> #include <linux/module.h> #include <linux/kmod.h> @@ -1321,7 +1322,7 @@ static inline void hci_sched_acl(struct hci_dev *hdev) if (!test_bit(HCI_RAW, &hdev->flags)) { /* ACL tx timeout must be longer than maximum * link supervision timeout (40.9 seconds) */ - if (!hdev->acl_cnt && (jiffies - hdev->acl_last_tx) > (HZ * 45)) + if (!hdev->acl_cnt && time_after(jiffies, hdev->acl_last_tx + HZ * 45)) hci_acl_tx_to(hdev); } @@ -1543,7 +1544,7 @@ static void hci_cmd_task(unsigned long arg) BT_DBG("%s cmd %d", hdev->name, atomic_read(&hdev->cmd_cnt)); - if (!atomic_read(&hdev->cmd_cnt) && (jiffies - hdev->cmd_last_tx) > HZ) { + if (!atomic_read(&hdev->cmd_cnt) && time_after(jiffies, hdev->cmd_last_tx + HZ)) { BT_ERR("%s command tx timeout", hdev->name); atomic_set(&hdev->cmd_cnt, 1); } -- 1.5.3.7 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Bluez-devel] [PATCH 14/14] net/bluetooth/hci_core.c: Use time_* macros 2008-02-14 15:36 ` S.Çağlar Onur @ 2008-02-14 16:03 ` Marcel Holtmann -1 siblings, 0 replies; 7+ messages in thread From: Marcel Holtmann @ 2008-02-14 16:03 UTC (permalink / raw) To: BlueZ development; +Cc: S.Çağlar Onur, linux-kernel, bluez-devel SGksCgo+IFRoZSBmdW5jdGlvbnMgdGltZV9iZWZvcmUsIHRpbWVfYmVmb3JlX2VxLCB0aW1lX2Fm dGVyLCBhbmQgdGltZV9hZnRlcl9lcSBhcmUgbW9yZSByb2J1c3QgZm9yIGNvbXBhcmluZyBqaWZm aWVzIGFnYWluc3Qgb3RoZXIgdmFsdWVzLgo+IAo+IFNvIGZvbGxvd2luZyBwYXRjaCBpbXBsZW1l bnRzIHVzYWdlIG9mIHRoZSB0aW1lX2FmdGVyKCkgbWFjcm8sIGRlZmluZWQgYXQgbGludXgvamlm Zmllcy5oLCB3aGljaCBkZWFscyB3aXRoIHdyYXBwaW5nIGNvcnJlY3RseQo+IAo+IENjOiBibHVl ei1kZXZlbEBsaXN0cy5zZi5uZXQKPiBTaWduZWQtb2ZmLWJ5OiBTLsOHYcSfbGFyIE9udXIgPGNh Z2xhckBwYXJkdXMub3JnLnRyPgoKc2luY2UgdGhpcyBpcyBmdWxsIHNlcmlvdXMgb2YgcGF0Y2hl cywgSSBhbSBub3Qgc3VyZSBpZiBpdCBzaG91bGQgZ28gdmlhCnRoZSBzdWJzeXN0ZW0gbWFpbnRh aW5lcnMgb3IgYmV0dGVyIGFwcGxpZWQgYXMgd2hvbGUuIEluIGNhc2Ugb2YgTGludXMKb3IgQW5k cmV3IGRlY2lkZSB0byB0YWtlIHRoZW0gYWxsIGF0IG9uY2UgYW5kIHB1c2ggdGhlbSwgdGhpcyBv biBpcwphY2tlZCBieSBtZS4KCkFja2VkLWJ5OiBNYXJjZWwgSG9sdG1hbm4gPG1hcmNlbEBob2x0 bWFubi5vcmc+CgpSZWdhcmRzCgpNYXJjZWwKCgoKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpUaGlzIFNGLm5l dCBlbWFpbCBpcyBzcG9uc29yZWQgYnk6IE1pY3Jvc29mdApEZWZ5IGFsbCBjaGFsbGVuZ2VzLiBN aWNyb3NvZnQoUikgVmlzdWFsIFN0dWRpbyAyMDA4LgpodHRwOi8vY2xrLmF0ZG10LmNvbS9NUlQv Z28vdnNlMDEyMDAwMDA3MG1ydC9kaXJlY3QvMDEvCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkJsdWV6LWRldmVsIG1haWxpbmcgbGlzdApCbHVlei1kZXZl bEBsaXN0cy5zb3VyY2Vmb3JnZS5uZXQKaHR0cHM6Ly9saXN0cy5zb3VyY2Vmb3JnZS5uZXQvbGlz dHMvbGlzdGluZm8vYmx1ZXotZGV2ZWwK ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Bluez-devel] [PATCH 14/14] net/bluetooth/hci_core.c: Use time_* macros @ 2008-02-14 16:03 ` Marcel Holtmann 0 siblings, 0 replies; 7+ messages in thread From: Marcel Holtmann @ 2008-02-14 16:03 UTC (permalink / raw) To: BlueZ development; +Cc: linux-kernel, S.Çağlar Onur, bluez-devel Hi, > The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. > > So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly > > Cc: bluez-devel@lists.sf.net > Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr> since this is full serious of patches, I am not sure if it should go via the subsystem maintainers or better applied as whole. In case of Linus or Andrew decide to take them all at once and push them, this on is acked by me. Acked-by: Marcel Holtmann <marcel@holtmann.org> Regards Marcel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Bluez-devel] [PATCH 14/14] net/bluetooth/hci_core.c: Use time_* macros 2008-02-14 16:03 ` Marcel Holtmann @ 2008-02-18 7:25 ` David Miller -1 siblings, 0 replies; 7+ messages in thread From: David Miller @ 2008-02-18 7:25 UTC (permalink / raw) To: marcel; +Cc: bluez-devel, linux-kernel, caglar, bluez-devel From: Marcel Holtmann <marcel@holtmann.org> Date: Thu, 14 Feb 2008 17:03:51 +0100 > since this is full serious of patches, I am not sure if it should go via > the subsystem maintainers or better applied as whole. In case of Linus > or Andrew decide to take them all at once and push them, this on is > acked by me. I'll take care of it. > Acked-by: Marcel Holtmann <marcel@holtmann.org> Thanks. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Bluez-devel] [PATCH 14/14] net/bluetooth/hci_core.c: Use time_* macros @ 2008-02-18 7:25 ` David Miller 0 siblings, 0 replies; 7+ messages in thread From: David Miller @ 2008-02-18 7:25 UTC (permalink / raw) To: marcel; +Cc: bluez-devel, linux-kernel, caglar, bluez-devel From: Marcel Holtmann <marcel@holtmann.org> Date: Thu, 14 Feb 2008 17:03:51 +0100 > since this is full serious of patches, I am not sure if it should go via > the subsystem maintainers or better applied as whole. In case of Linus > or Andrew decide to take them all at once and push them, this on is > acked by me. I'll take care of it. > Acked-by: Marcel Holtmann <marcel@holtmann.org> Thanks. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Bluez-devel] [PATCH 14/14] net/bluetooth/hci_core.c: Use time_* macros 2008-02-14 15:36 ` S.Çağlar Onur (?) (?) @ 2008-02-18 7:25 ` David Miller -1 siblings, 0 replies; 7+ messages in thread From: David Miller @ 2008-02-18 7:25 UTC (permalink / raw) To: caglar; +Cc: linux-kernel, bluez-devel RnJvbTogUy7Dh2HEn2xhciBPbnVyIDxjYWdsYXJAcGFyZHVzLm9yZy50cj4NCkRhdGU6IFRodSwg MTQgRmViIDIwMDggMTc6MzY6NTIgKzAyMDANCg0KPiBUaGUgZnVuY3Rpb25zIHRpbWVfYmVmb3Jl LCB0aW1lX2JlZm9yZV9lcSwgdGltZV9hZnRlciwgYW5kIHRpbWVfYWZ0ZXJfZXEgYXJlIG1vcmUg cm9idXN0IGZvciBjb21wYXJpbmcgamlmZmllcyBhZ2FpbnN0IG90aGVyIHZhbHVlcy4NCj4gDQo+ IFNvIGZvbGxvd2luZyBwYXRjaCBpbXBsZW1lbnRzIHVzYWdlIG9mIHRoZSB0aW1lX2FmdGVyKCkg bWFjcm8sIGRlZmluZWQgYXQgbGludXgvamlmZmllcy5oLCB3aGljaCBkZWFscyB3aXRoIHdyYXBw aW5nIGNvcnJlY3RseQ0KPiANCj4gQ2M6IGJsdWV6LWRldmVsQGxpc3RzLnNmLm5ldA0KPiBTaWdu ZWQtb2ZmLWJ5OiBTLsOHYcSfbGFyIE9udXIgPGNhZ2xhckBwYXJkdXMub3JnLnRyPg0KDQpBbHNv IGFwcGxpZWQsIHRoYW5rcy4NCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KVGhpcyBTRi5uZXQgZW1haWwgaXMg c3BvbnNvcmVkIGJ5OiBNaWNyb3NvZnQKRGVmeSBhbGwgY2hhbGxlbmdlcy4gTWljcm9zb2Z0KFIp IFZpc3VhbCBTdHVkaW8gMjAwOC4KaHR0cDovL2Nsay5hdGRtdC5jb20vTVJUL2dvL3ZzZTAxMjAw MDAwNzBtcnQvZGlyZWN0LzAxLwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpCbHVlei1kZXZlbCBtYWlsaW5nIGxpc3QKQmx1ZXotZGV2ZWxAbGlzdHMuc291 cmNlZm9yZ2UubmV0Cmh0dHBzOi8vbGlzdHMuc291cmNlZm9yZ2UubmV0L2xpc3RzL2xpc3RpbmZv L2JsdWV6LWRldmVsCg== ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2008-02-18 7:25 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-02-14 15:36 [Bluez-devel] [PATCH 14/14] net/bluetooth/hci_core.c: Use time_* macros S.Çağlar Onur 2008-02-14 15:36 ` S.Çağlar Onur 2008-02-14 16:03 ` [Bluez-devel] " Marcel Holtmann 2008-02-14 16:03 ` Marcel Holtmann 2008-02-18 7:25 ` David Miller 2008-02-18 7:25 ` David Miller 2008-02-18 7:25 ` David Miller
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.