Documentation/email-clients.txt: add some info about gmail

[linux-2.6-omap-h63xx.git] / net / dccp / ccid.c

diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index ccbf72c793b6c61381b40d466073a89f2bfb4575..8fe931a3d7a1b1b7240a3421b7af0c404afae375 100644 (file)
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -40,6 +40,7 @@ static inline void ccids_write_unlock(void)
 static inline void ccids_read_lock(void)
 {
        atomic_inc(&ccids_lockct);
+       smp_mb__after_atomic_inc();
        spin_unlock_wait(&ccids_lock);
 }
 
@@ -91,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;
 
@@ -153,7 +154,7 @@ struct ccid *ccid_new(unsigned char id, struct sock *sk, int rx, gfp_t gfp)
        struct ccid *ccid = NULL;
 
        ccids_read_lock();
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
        if (ccids[id] == NULL) {
                /* We only try to load if in process context */
                ccids_read_unlock();