VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / net / bluetooth / af_bluetooth.c

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index e111cf3..e0fa1b0 100644 (file)
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -51,13 +51,13 @@
 #define BT_DBG(D...)
 #endif
 
-#define VERSION "2.5"
+#define VERSION "2.6"
 
 struct proc_dir_entry *proc_bt;
 EXPORT_SYMBOL(proc_bt);
 
 /* Bluetooth sockets */
-#define BT_MAX_PROTO   7
+#define BT_MAX_PROTO   8
 static struct net_proto_family *bt_proto[BT_MAX_PROTO];
 
 static kmem_cache_t *bt_sock_cache;
@@ -354,7 +354,7 @@ static int __init bt_init(void)
        /* Init socket cache */
        bt_sock_cache = kmem_cache_create("bt_sock",
                        sizeof(struct bt_sock), 0,
-                       SLAB_HWCACHE_ALIGN, 0, 0);
+                       SLAB_HWCACHE_ALIGN, NULL, NULL);
 
        if (!bt_sock_cache) {
                BT_ERR("Socket cache creation failed");