diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-05-15 16:38:00 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-15 16:38:00 -0400 |
| commit | 60374631487a6dbf6b888729022f0e8d76eec8fb (patch) | |
| tree | 4adda0d1a8616ce586ea26a25717477c9e18667a /include | |
| parent | 8aa51d64c1f526e43b1e7f89fb8b98c2fd583f4b (diff) | |
| parent | 671267bf3aac3dae0555730b07ef29c042e325b2 (diff) | |
| download | linux-60374631487a6dbf6b888729022f0e8d76eec8fb.tar.gz linux-60374631487a6dbf6b888729022f0e8d76eec8fb.tar.bz2 linux-60374631487a6dbf6b888729022f0e8d76eec8fb.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'include')
| -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 262ebd1747d4..a65910bda381 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -191,6 +191,7 @@ struct bt_sock { struct list_head accept_q; struct sock *parent; u32 defer_setup; + bool suspended; }; struct bt_sock_list { |