diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 12:00:36 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 12:00:36 +0100 |
| commit | ee91337bc3e1773b52040c99fa657d0580242521 (patch) | |
| tree | 53cfcff3a652fa8c155b0f9b000cd142972f5c21 /include/net/bluetooth/sco.h | |
| parent | 5d5e7b5d11dfe6f29e9ed0369f96cd0363468dc6 (diff) | |
| parent | 287c91dfbd55defbb2080d34cc6b386f7968be2d (diff) | |
Merge branch 'other' into linux-stable-ux500-3.1
Diffstat (limited to 'include/net/bluetooth/sco.h')
| -rw-r--r-- | include/net/bluetooth/sco.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h index 1e35c43657c..e6b5a94f7e8 100644 --- a/include/net/bluetooth/sco.h +++ b/include/net/bluetooth/sco.h @@ -72,7 +72,9 @@ struct sco_conn { struct sco_pinfo { struct bt_sock bt; - __u32 flags; + struct bt_sco_parameters param; + __u8 no_autoretry; + struct sco_conn *conn; }; |