diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-16 15:11:44 -0400 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-16 15:11:44 -0400 |
| commit | 08e6d907fe606b751adddce54ad8f51e0950bc3f (patch) | |
| tree | 1a987f519b1ea706a61cd23d7eeea038dfe81b7a /include/net | |
| parent | d34c34fb2592bd5231a153ad1676c3ded175410a (diff) | |
| parent | 671267bf3aac3dae0555730b07ef29c042e325b2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 2fb268f2895b..c34a9a6184a1 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h | |||
| @@ -195,6 +195,7 @@ struct bt_sock { | |||
| 195 | struct list_head accept_q; | 195 | struct list_head accept_q; |
| 196 | struct sock *parent; | 196 | struct sock *parent; |
| 197 | u32 defer_setup; | 197 | u32 defer_setup; |
| 198 | bool suspended; | ||
| 198 | }; | 199 | }; |
| 199 | 200 | ||
| 200 | struct bt_sock_list { | 201 | struct bt_sock_list { |