patch-2.4.20 linux-2.4.20/net/bluetooth/sco.c
Next file: linux-2.4.20/net/bridge/br.c
Previous file: linux-2.4.20/net/bluetooth/l2cap.c
Back to the patch index
Back to the overall index
- Lines: 56
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/net/bluetooth/sco.c
- Orig date:
Fri Aug 2 17:39:46 2002
diff -urN linux-2.4.19/net/bluetooth/sco.c linux-2.4.20/net/bluetooth/sco.c
@@ -25,9 +25,9 @@
/*
* BlueZ SCO sockets.
*
- * $Id: sco.c,v 1.3 2002/04/17 17:37:16 maxk Exp $
+ * $Id: sco.c,v 1.4 2002/07/22 20:32:54 maxk Exp $
*/
-#define VERSION "0.2"
+#define VERSION "0.3"
#include <linux/config.h>
#include <linux/module.h>
@@ -464,19 +464,17 @@
goto done;
}
- write_lock(&sco_sk_list.lock);
+ write_lock_bh(&sco_sk_list.lock);
if (bacmp(src, BDADDR_ANY) && __sco_get_sock_by_addr(src)) {
err = -EADDRINUSE;
- goto unlock;
+ } else {
+ /* Save source address */
+ bacpy(&bluez_pi(sk)->src, &sa->sco_bdaddr);
+ sk->state = BT_BOUND;
}
- /* Save source address */
- bacpy(&bluez_pi(sk)->src, &sa->sco_bdaddr);
- sk->state = BT_BOUND;
-
-unlock:
- write_unlock(&sco_sk_list.lock);
+ write_unlock_bh(&sco_sk_list.lock);
done:
release_sock(sk);
@@ -897,7 +895,7 @@
struct sock *sk;
char *ptr = buf;
- write_lock(&list->lock);
+ write_lock_bh(&list->lock);
for (sk = list->head; sk; sk = sk->next) {
pi = sco_pi(sk);
@@ -906,7 +904,7 @@
sk->state);
}
- write_unlock(&list->lock);
+ write_unlock_bh(&list->lock);
ptr += sprintf(ptr, "\n");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)