git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
bluetooth
/
af_bluetooth.c
diff --git
a/net/bluetooth/af_bluetooth.c
b/net/bluetooth/af_bluetooth.c
index
788ea7a
..
fb031fe
100644
(file)
--- a/
net/bluetooth/af_bluetooth.c
+++ b/
net/bluetooth/af_bluetooth.c
@@
-24,6
+24,7
@@
/* Bluetooth address family and sockets. */
/* Bluetooth address family and sockets. */
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/types.h>
@@
-48,7
+49,7
@@
#define BT_DBG(D...)
#endif
#define BT_DBG(D...)
#endif
-#define VERSION "2.
10
"
+#define VERSION "2.
8
"
/* Bluetooth sockets */
#define BT_MAX_PROTO 8
/* Bluetooth sockets */
#define BT_MAX_PROTO 8
@@
-237,9
+238,6
@@
unsigned int bt_sock_poll(struct file * file, struct socket *sock, poll_table *w
if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
mask |= POLLERR;
if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
mask |= POLLERR;
- if (sk->sk_shutdown & RCV_SHUTDOWN)
- mask |= POLLRDHUP;
-
if (sk->sk_shutdown == SHUTDOWN_MASK)
mask |= POLLHUP;
if (sk->sk_shutdown == SHUTDOWN_MASK)
mask |= POLLHUP;
@@
-307,22
+305,14
@@
static struct net_proto_family bt_sock_family_ops = {
static int __init bt_init(void)
{
static int __init bt_init(void)
{
- int err;
-
BT_INFO("Core ver %s", VERSION);
BT_INFO("Core ver %s", VERSION);
- err = bt_sysfs_init();
- if (err < 0)
- return err;
-
- err = sock_register(&bt_sock_family_ops);
- if (err < 0) {
- bt_sysfs_cleanup();
- return err;
- }
+ sock_register(&bt_sock_family_ops);
BT_INFO("HCI device and connection manager initialized");
BT_INFO("HCI device and connection manager initialized");
+ bt_sysfs_init();
+
hci_sock_init();
return 0;
hci_sock_init();
return 0;
@@
-332,9
+322,9
@@
static void __exit bt_exit(void)
{
hci_sock_cleanup();
{
hci_sock_cleanup();
- sock_unregister(PF_BLUETOOTH);
-
bt_sysfs_cleanup();
bt_sysfs_cleanup();
+
+ sock_unregister(PF_BLUETOOTH);
}
subsys_initcall(bt_init);
}
subsys_initcall(bt_init);