- Update to 2.6.25-rc3.

[linux-flexiantxendom0-3.2.10.git] / net / dccp / ccid.c

diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index c45088b..4809753 100644 (file)
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -92,15 +92,15 @@ int ccid_register(struct ccid_operations *ccid_ops)
 
        ccid_ops->ccid_hc_rx_slab =
                        ccid_kmem_cache_create(ccid_ops->ccid_hc_rx_obj_size,
-                                              "%s_hc_rx_sock",
-                                              ccid_ops->ccid_name);
+                                              "ccid%u_hc_rx_sock",
+                                              ccid_ops->ccid_id);
        if (ccid_ops->ccid_hc_rx_slab == NULL)
                goto out;
 
        ccid_ops->ccid_hc_tx_slab =
                        ccid_kmem_cache_create(ccid_ops->ccid_hc_tx_obj_size,
-                                              "%s_hc_tx_sock",
-                                              ccid_ops->ccid_name);
+                                              "ccid%u_hc_tx_sock",
+                                              ccid_ops->ccid_id);
        if (ccid_ops->ccid_hc_tx_slab == NULL)
                goto out_free_rx_slab;