diff options
| author |   Johan Hedberg <johan.hedberg@intel.com> | 2014-08-11 22:06:41 +0300 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2014-08-14 08:49:24 +0200 |
| commit | 276d807317dead63ef2f13aa46e3c17d57ba0713 (patch) | |
| tree | 719ae8337895f40404e3f01a0823c3b89dd678e5 /include/net/bluetooth/l2cap.h | |
| parent | Bluetooth: Add SMP-internal timeout callback (diff) | |
| download | linux-dev-276d807317dead63ef2f13aa46e3c17d57ba0713.tar.xz linux-dev-276d807317dead63ef2f13aa46e3c17d57ba0713.zip | |
Bluetooth: Remove unused l2cap_conn->security_timer
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>
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 40f34866b6da..cedda399f9c0 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -638,7 +638,6 @@ struct l2cap_conn { __u8 disc_reason; - struct delayed_work security_timer; struct l2cap_chan *smp; struct list_head chan_l; |