diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:46:24 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:46:24 +0800 |
| commit | 29a3e1ef73daaa91cbf5cce2fb475f1878254402 (patch) | |
| tree | fbd1df992706a4786633a7986a31b9cf78b3dced /include/net/bluetooth/sco.h | |
| parent | 564119271649aa2d1840e79badf743e957b497e6 (diff) | |
| parent | 3c16bd7bb0a2b00b71f65bb0075e0c94d0fcc777 (diff) | |
Merge Linaro Android branch ' jstultz/linaro-android-3.4
' into integration-android-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'include/net/bluetooth/sco.h')
| -rw-r--r-- | include/net/bluetooth/sco.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h index e6b5a94f7e8..e43f1e1f635 100644 --- a/include/net/bluetooth/sco.h +++ b/include/net/bluetooth/sco.h @@ -37,6 +37,7 @@ struct sockaddr_sco { sa_family_t sco_family; bdaddr_t sco_bdaddr; + __u16 sco_pkt_type; }; /* SCO socket options */ @@ -72,6 +73,7 @@ struct sco_conn { struct sco_pinfo { struct bt_sock bt; + __u16 pkt_type; struct bt_sco_parameters param; __u8 no_autoretry; |