aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/sco.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/sco.c')
-rw-r--r--net/bluetooth/sco.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 5d13d4f31753..ae4391440950 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -1,4 +1,4 @@
1/* 1/*
2 BlueZ - Bluetooth protocol stack for Linux 2 BlueZ - Bluetooth protocol stack for Linux
3 Copyright (C) 2000-2001 Qualcomm Incorporated 3 Copyright (C) 2000-2001 Qualcomm Incorporated
4 4
@@ -12,13 +12,13 @@
12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
14 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 14 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
15 CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 15 CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
16 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 16 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 17 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 19
20 ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 20 ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
21 COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 21 COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
22 SOFTWARE IS DISCLAIMED. 22 SOFTWARE IS DISCLAIMED.
23*/ 23*/
24 24
@@ -149,7 +149,7 @@ static int sco_conn_del(struct hci_conn *hcon, int err)
149 struct sco_conn *conn; 149 struct sco_conn *conn;
150 struct sock *sk; 150 struct sock *sk;
151 151
152 if (!(conn = hcon->sco_data)) 152 if (!(conn = hcon->sco_data))
153 return 0; 153 return 0;
154 154
155 BT_DBG("hcon %p conn %p, err %d", hcon, conn, err); 155 BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);
@@ -404,7 +404,7 @@ static void sco_sock_init(struct sock *sk, struct sock *parent)
404{ 404{
405 BT_DBG("sk %p", sk); 405 BT_DBG("sk %p", sk);
406 406
407 if (parent) 407 if (parent)
408 sk->sk_type = parent->sk_type; 408 sk->sk_type = parent->sk_type;
409} 409}
410 410
@@ -522,7 +522,7 @@ static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen
522 if ((err = sco_connect(sk))) 522 if ((err = sco_connect(sk)))
523 goto done; 523 goto done;
524 524
525 err = bt_sock_wait_state(sk, BT_CONNECTED, 525 err = bt_sock_wait_state(sk, BT_CONNECTED,
526 sock_sndtimeo(sk, flags & O_NONBLOCK)); 526 sock_sndtimeo(sk, flags & O_NONBLOCK));
527 527
528done: 528done:
@@ -627,7 +627,7 @@ static int sco_sock_getname(struct socket *sock, struct sockaddr *addr, int *len
627 return 0; 627 return 0;
628} 628}
629 629
630static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 630static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
631 struct msghdr *msg, size_t len) 631 struct msghdr *msg, size_t len)
632{ 632{
633 struct sock *sk = sock->sk; 633 struct sock *sk = sock->sk;
@@ -677,7 +677,7 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char
677 struct sock *sk = sock->sk; 677 struct sock *sk = sock->sk;
678 struct sco_options opts; 678 struct sco_options opts;
679 struct sco_conninfo cinfo; 679 struct sco_conninfo cinfo;
680 int len, err = 0; 680 int len, err = 0;
681 681
682 BT_DBG("sk %p", sk); 682 BT_DBG("sk %p", sk);
683 683
@@ -761,7 +761,7 @@ static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *
761 bt_accept_enqueue(parent, sk); 761 bt_accept_enqueue(parent, sk);
762} 762}
763 763
764/* Delete channel. 764/* Delete channel.
765 * Must be called on the locked socket. */ 765 * Must be called on the locked socket. */
766static void sco_chan_del(struct sock *sk, int err) 766static void sco_chan_del(struct sock *sk, int err)
767{ 767{
@@ -771,7 +771,7 @@ static void sco_chan_del(struct sock *sk, int err)
771 771
772 BT_DBG("sk %p, conn %p, err %d", sk, conn, err); 772 BT_DBG("sk %p, conn %p, err %d", sk, conn, err);
773 773
774 if (conn) { 774 if (conn) {
775 sco_conn_lock(conn); 775 sco_conn_lock(conn);
776 conn->sk = NULL; 776 conn->sk = NULL;
777 sco_pi(sk)->conn = NULL; 777 sco_pi(sk)->conn = NULL;
@@ -855,7 +855,7 @@ static int sco_connect_cfm(struct hci_conn *hcon, __u8 status)
855 conn = sco_conn_add(hcon, status); 855 conn = sco_conn_add(hcon, status);
856 if (conn) 856 if (conn)
857 sco_conn_ready(conn); 857 sco_conn_ready(conn);
858 } else 858 } else
859 sco_conn_del(hcon, bt_err(status)); 859 sco_conn_del(hcon, bt_err(status));
860 860
861 return 0; 861 return 0;
@@ -887,7 +887,7 @@ static int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb)
887 } 887 }
888 888
889drop: 889drop:
890 kfree_skb(skb); 890 kfree_skb(skb);
891 return 0; 891 return 0;
892} 892}
893 893