diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:38 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:38 +0800 |
| commit | 20c81608dcd30fc3817d6d430fca83f52b9aa965 (patch) | |
| tree | 1089db91ce174f5768dadd210ba3096ad027c8a6 /include/net/bluetooth/sco.h | |
| parent | 78b63e0cee40de1adbe69ceee752ae3b6a6d36e2 (diff) | |
| parent | 961f14635e3589d262af5dcdc596cbb5bc24aea7 (diff) | |
Merge topic branch 'other' into integration-linux-ux500
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; }; |