diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-09 11:37:00 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-09 11:37:00 +0000 |
| commit | eed4bafd63b5584adb832a582a931ecba41dec55 (patch) | |
| tree | 5855807caaf53aec80037b2635eb2e2c0744565b /include/net/bluetooth/sco.h | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| parent | 2c06cb20454795a38876be5bd93dd6a8ddcc9d98 (diff) | |
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aosp
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..6d1857ab8e5 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,7 +73,8 @@ struct sco_conn { struct sco_pinfo { struct bt_sock bt; - __u32 flags; + __u16 pkt_type; + struct sco_conn *conn; }; |