git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b68fda6)
Bluetooth: Remove unused l2cap_conn->security_timer
authorJohan Hedberg <johan.hedberg@intel.com>
Mon, 11 Aug 2014 19:06:41 +0000 (22:06 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 14 Aug 2014 06:49:24 +0000 (08:49 +0200)
Now that there are no-longer any users for l2cap_conn->security_timer we
can go ahead and simply remove it. The patch makes initialization of the
conn->info_timer unconditional since it's better not to leave any
l2cap_conn data structures uninitialized no matter what the underlying
transport.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
include/net/bluetooth/l2cap.h patch | blob | history
net/bluetooth/l2cap_core.c patch | blob | history

diff --cc include/net/bluetooth/l2cap.h
Simple merge
diff --cc net/bluetooth/l2cap_core.c
Simple merge
Pandora Kernel Repository