From 7e73216fa0c25203e1c9c8130c730cd1d95f183e Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 29 Jun 2011 18:18:29 -0700
Subject: [PATCH] --- yaml --- r: 256390 b: refs/heads/master c:
 e175072f377047e28e399c5c661e39e69722f35b h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/include/net/bluetooth/bluetooth.h | 2 +-
 trunk/net/bluetooth/hci_core.c          | 2 +-
 trunk/net/bluetooth/l2cap_core.c        | 4 ++--
 trunk/net/bluetooth/lib.c               | 4 ++--
 trunk/net/bluetooth/sco.c               | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index c9075b52bbbf..2326b2d4a741 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 942ecc9c4643db5ce071562e0a23f99464d6b461
+refs/heads/master: e175072f377047e28e399c5c661e39e69722f35b
diff --git a/trunk/include/net/bluetooth/bluetooth.h b/trunk/include/net/bluetooth/bluetooth.h
index 7bccaf921cab..7d77545fdd64 100644
--- a/trunk/include/net/bluetooth/bluetooth.h
+++ b/trunk/include/net/bluetooth/bluetooth.h
@@ -204,7 +204,7 @@ static inline struct sk_buff *bt_skb_send_alloc(struct sock *sk,
 	return NULL;
 }
 
-int bt_err(__u16 code);
+int bt_to_errno(__u16 code);
 
 extern int hci_sock_init(void);
 extern void hci_sock_cleanup(void);
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index 0029e178e52e..cd59b849d055 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/net/bluetooth/hci_core.c
@@ -148,7 +148,7 @@ static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev,
 
 	switch (hdev->req_status) {
 	case HCI_REQ_DONE:
-		err = -bt_err(hdev->req_result);
+		err = -bt_to_errno(hdev->req_result);
 		break;
 
 	case HCI_REQ_CANCELED:
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index fb5238133005..becf2ad72208 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -4107,7 +4107,7 @@ static int l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
 		if (conn)
 			l2cap_conn_ready(conn);
 	} else
-		l2cap_conn_del(hcon, bt_err(status));
+		l2cap_conn_del(hcon, bt_to_errno(status));
 
 	return 0;
 }
@@ -4131,7 +4131,7 @@ static int l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason)
 	if (!(hcon->type == ACL_LINK || hcon->type == LE_LINK))
 		return -EINVAL;
 
-	l2cap_conn_del(hcon, bt_err(reason));
+	l2cap_conn_del(hcon, bt_to_errno(reason));
 
 	return 0;
 }
diff --git a/trunk/net/bluetooth/lib.c b/trunk/net/bluetooth/lib.c
index b826d1bf10df..4e7cf8b0bd87 100644
--- a/trunk/net/bluetooth/lib.c
+++ b/trunk/net/bluetooth/lib.c
@@ -59,7 +59,7 @@ char *batostr(bdaddr_t *ba)
 EXPORT_SYMBOL(batostr);
 
 /* Bluetooth error codes to Unix errno mapping */
-int bt_err(__u16 code)
+int bt_to_errno(__u16 code)
 {
 	switch (code) {
 	case 0:
@@ -149,4 +149,4 @@ int bt_err(__u16 code)
 		return ENOSYS;
 	}
 }
-EXPORT_SYMBOL(bt_err);
+EXPORT_SYMBOL(bt_to_errno);
diff --git a/trunk/net/bluetooth/sco.c b/trunk/net/bluetooth/sco.c
index cb4fb7837e5c..4c3621b5e0aa 100644
--- a/trunk/net/bluetooth/sco.c
+++ b/trunk/net/bluetooth/sco.c
@@ -932,7 +932,7 @@ static int sco_connect_cfm(struct hci_conn *hcon, __u8 status)
 		if (conn)
 			sco_conn_ready(conn);
 	} else
-		sco_conn_del(hcon, bt_err(status));
+		sco_conn_del(hcon, bt_to_errno(status));
 
 	return 0;
 }
@@ -944,7 +944,7 @@ static int sco_disconn_cfm(struct hci_conn *hcon, __u8 reason)
 	if (hcon->type != SCO_LINK && hcon->type != ESCO_LINK)
 		return -EINVAL;
 
-	sco_conn_del(hcon, bt_err(reason));
+	sco_conn_del(hcon, bt_to_errno(reason));
 
 	return 0;
 }