projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
[cascardo/linux.git]
/
include
/
net
/
bluetooth
/
sco.h
diff --git
a/include/net/bluetooth/sco.h
b/include/net/bluetooth/sco.h
index
e252a31
..
2019d1a
100644
(file)
--- a/
include/net/bluetooth/sco.h
+++ b/
include/net/bluetooth/sco.h
@@
-55,9
+55,6
@@
struct sco_conninfo {
struct sco_conn {
struct hci_conn *hcon;
- bdaddr_t *dst;
- bdaddr_t *src;
-
spinlock_t lock;
struct sock *sk;
@@
-72,6
+69,8
@@
struct sco_conn {
struct sco_pinfo {
struct bt_sock bt;
+ bdaddr_t src;
+ bdaddr_t dst;
__u32 flags;
__u16 setting;
struct sco_conn *conn;