diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2014-07-11 00:19:42 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-11 06:58:53 -0400 |
commit | fc8f525a6f7c81743bec6b5d497988313b211383 (patch) | |
tree | 163678e8a1cc8e86f61f80934f904251aaf4a984 | |
parent | 2a0dccb3df2c8775d1a6e962aa88c4c22693c887 (diff) |
Bluetooth: Move struct sco_conn into net/bluetooth/sco.c
There exists no external user of struct sco_conn and thus move
it into the one place that is actually using it.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-rw-r--r-- | include/net/bluetooth/sco.h | 13 | ||||
-rw-r--r-- | net/bluetooth/sco.c | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h index 7fec7cbd7396..42a0d089d715 100644 --- a/include/net/bluetooth/sco.h +++ b/include/net/bluetooth/sco.h | |||
@@ -51,17 +51,4 @@ struct sco_conninfo { | |||
51 | __u8 dev_class[3]; | 51 | __u8 dev_class[3]; |
52 | }; | 52 | }; |
53 | 53 | ||
54 | /* ---- SCO connections ---- */ | ||
55 | struct sco_conn { | ||
56 | struct hci_conn *hcon; | ||
57 | |||
58 | spinlock_t lock; | ||
59 | struct sock *sk; | ||
60 | |||
61 | unsigned int mtu; | ||
62 | }; | ||
63 | |||
64 | #define sco_conn_lock(c) spin_lock(&c->lock); | ||
65 | #define sco_conn_unlock(c) spin_unlock(&c->lock); | ||
66 | |||
67 | #endif /* __SCO_H */ | 54 | #endif /* __SCO_H */ |
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index c71698642ec6..9868ec7c7dc4 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
@@ -40,6 +40,19 @@ static struct bt_sock_list sco_sk_list = { | |||
40 | .lock = __RW_LOCK_UNLOCKED(sco_sk_list.lock) | 40 | .lock = __RW_LOCK_UNLOCKED(sco_sk_list.lock) |
41 | }; | 41 | }; |
42 | 42 | ||
43 | /* ---- SCO connections ---- */ | ||
44 | struct sco_conn { | ||
45 | struct hci_conn *hcon; | ||
46 | |||
47 | spinlock_t lock; | ||
48 | struct sock *sk; | ||
49 | |||
50 | unsigned int mtu; | ||
51 | }; | ||
52 | |||
53 | #define sco_conn_lock(c) spin_lock(&c->lock); | ||
54 | #define sco_conn_unlock(c) spin_unlock(&c->lock); | ||
55 | |||
43 | static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent); | 56 | static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent); |
44 | static void sco_chan_del(struct sock *sk, int err); | 57 | static void sco_chan_del(struct sock *sk, int err); |
45 | 58 | ||