diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-22 18:27:31 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-22 18:27:31 (GMT) |
| commit | 69b307a48a5e10d5fd53dbbfae1c700da356bd5d (patch) | |
| tree | 0a09cc42b3a592d19e5229a84c93f2b58f8c89d3 /include/net/bluetooth/sco.h | |
| parent | 24de851b79a414f0e1813eb131a7d90849cc22c2 (diff) | |
| parent | 2dea632f9acad076370fe871d4ccc93868621403 (diff) | |
| download | linux-fsl-qoriq-69b307a48a5e10d5fd53dbbfae1c700da356bd5d.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'include/net/bluetooth/sco.h')
| -rw-r--r-- | include/net/bluetooth/sco.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h index 1e35c43..e252a31 100644 --- a/include/net/bluetooth/sco.h +++ b/include/net/bluetooth/sco.h @@ -73,6 +73,7 @@ struct sco_conn { struct sco_pinfo { struct bt_sock bt; __u32 flags; + __u16 setting; struct sco_conn *conn; }; |