]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Bluetooth: l2cap_set_timer needs jiffies as timeout value
authorAndrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Wed, 4 Jan 2012 11:10:42 +0000 (12:10 +0100)
committerJohan Hedberg <johan.hedberg@intel.com>
Wed, 15 Feb 2012 11:09:25 +0000 (13:09 +0200)
commit6e1da683f79a22fafaada62d547138daaa9e3456
treed3502a1dd0a2df2d13e9d53a70042f68381e0ee3
parenta63752552b95624a9f1dfa3d763870f72f964ad0
Bluetooth: l2cap_set_timer needs jiffies as timeout value

After moving L2CAP timers to workqueues l2cap_set_timer expects timeout
value to be specified in jiffies but constants defined in miliseconds
are used. This makes timeouts unreliable when CONFIG_HZ is not set to
1000.

__set_chan_timer macro still uses jiffies as input to avoid multiple
conversions from/to jiffies for sk_sndtimeo value which is already
specified in jiffies.

Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Ackec-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
include/net/bluetooth/l2cap.h
net/bluetooth/l2cap_core.c