git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Add timestamp support to L2CAP, RFCOMM and SCO
[pandora-kernel.git]
/
net
/
bluetooth
/
sco.c
diff --git
a/net/bluetooth/sco.c
b/net/bluetooth/sco.c
index
93ad1aa
..
1ad226c
100644
(file)
--- a/
net/bluetooth/sco.c
+++ b/
net/bluetooth/sco.c
@@
-58,7
+58,7
@@
static const struct proto_ops sco_sock_ops;
static struct bt_sock_list sco_sk_list = {
static const struct proto_ops sco_sock_ops;
static struct bt_sock_list sco_sk_list = {
- .lock =
RW_LOCK_UNLOCKED
+ .lock =
__RW_LOCK_UNLOCKED(sco_sk_list.lock)
};
static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent);
};
static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent);
@@
-97,13
+97,6
@@
static void sco_sock_clear_timer(struct sock *sk)
sk_stop_timer(sk, &sk->sk_timer);
}
sk_stop_timer(sk, &sk->sk_timer);
}
-static void sco_sock_init_timer(struct sock *sk)
-{
- init_timer(&sk->sk_timer);
- sk->sk_timer.function = sco_sock_timeout;
- sk->sk_timer.data = (unsigned long)sk;
-}
-
/* ---- SCO connections ---- */
static struct sco_conn *sco_conn_add(struct hci_conn *hcon, __u8 status)
{
/* ---- SCO connections ---- */
static struct sco_conn *sco_conn_add(struct hci_conn *hcon, __u8 status)
{
@@
-436,7
+429,7
@@
static struct sock *sco_sock_alloc(struct net *net, struct socket *sock, int pro
sk->sk_protocol = proto;
sk->sk_state = BT_OPEN;
sk->sk_protocol = proto;
sk->sk_state = BT_OPEN;
- s
co_sock_init_timer(
sk);
+ s
etup_timer(&sk->sk_timer, sco_sock_timeout, (unsigned long)
sk);
bt_sock_link(&sco_sk_list, sk);
return sk;
bt_sock_link(&sco_sk_list, sk);
return sk;
@@
-810,7
+803,7
@@
static void sco_conn_ready(struct sco_conn *conn)
bh_lock_sock(parent);
bh_lock_sock(parent);
- sk = sco_sock_alloc(
parent->sk_net
, NULL, BTPROTO_SCO, GFP_ATOMIC);
+ sk = sco_sock_alloc(
sock_net(parent)
, NULL, BTPROTO_SCO, GFP_ATOMIC);
if (!sk) {
bh_unlock_sock(parent);
goto done;
if (!sk) {
bh_unlock_sock(parent);
goto done;
@@
-928,7
+921,7
@@
static const struct proto_ops sco_sock_ops = {
.sendmsg = sco_sock_sendmsg,
.recvmsg = bt_sock_recvmsg,
.poll = bt_sock_poll,
.sendmsg = sco_sock_sendmsg,
.recvmsg = bt_sock_recvmsg,
.poll = bt_sock_poll,
- .ioctl =
sock_no
_ioctl,
+ .ioctl =
bt_sock
_ioctl,
.mmap = sock_no_mmap,
.socketpair = sock_no_socketpair,
.shutdown = sock_no_shutdown,
.mmap = sock_no_mmap,
.socketpair = sock_no_socketpair,
.shutdown = sock_no_shutdown,