1 files changed, 10 insertions, 10 deletions

diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c
index 1d4d6ee9be45..b628714fb2ab 100644
--- a/net/dccp/ccids/lib/packet_history.c
+++ b/net/dccp/ccids/lib/packet_history.c
@@ -53,7 +53,7 @@ struct tfrc_tx_hist_entry {
 /*
  * Transmitter History Routines
  */
-static struct kmem_cache *tfrc_tx_hist;
+static struct kmem_cache *tfrc_tx_hist_slab;
 
 static struct tfrc_tx_hist_entry *
         tfrc_tx_hist_find_entry(struct tfrc_tx_hist_entry *head, u64 seqno)
@@ -66,7 +66,7 @@ static struct tfrc_tx_hist_entry *
 
 int tfrc_tx_hist_add(struct tfrc_tx_hist_entry **headp, u64 seqno)
 {
-        struct tfrc_tx_hist_entry *entry = kmem_cache_alloc(tfrc_tx_hist, gfp_any());
+        struct tfrc_tx_hist_entry *entry = kmem_cache_alloc(tfrc_tx_hist_slab, gfp_any());
 
         if (entry == NULL)
                 return -ENOBUFS;
@@ -85,7 +85,7 @@ void tfrc_tx_hist_purge(struct tfrc_tx_hist_entry **headp)
         while (head != NULL) {
                 struct tfrc_tx_hist_entry *next = head->next;
 
-                kmem_cache_free(tfrc_tx_hist, head);
+                kmem_cache_free(tfrc_tx_hist_slab, head);
                 head = next;
         }
 
@@ -278,17 +278,17 @@ EXPORT_SYMBOL_GPL(dccp_rx_hist_purge);
 
 __init int packet_history_init(void)
 {
-        tfrc_tx_hist = kmem_cache_create("tfrc_tx_hist",
-                                         sizeof(struct tfrc_tx_hist_entry), 0,
-                                         SLAB_HWCACHE_ALIGN, NULL);
+        tfrc_tx_hist_slab = kmem_cache_create("tfrc_tx_hist",
+                                              sizeof(struct tfrc_tx_hist_entry), 0,
+                                              SLAB_HWCACHE_ALIGN, NULL);
 
-        return tfrc_tx_hist == NULL ? -ENOBUFS : 0;
+        return tfrc_tx_hist_slab == NULL ? -ENOBUFS : 0;
 }
 
 void packet_history_exit(void)
 {
-        if (tfrc_tx_hist != NULL) {
-                kmem_cache_destroy(tfrc_tx_hist);
-                tfrc_tx_hist = NULL;
+        if (tfrc_tx_hist_slab != NULL) {
+                kmem_cache_destroy(tfrc_tx_hist_slab);
+                tfrc_tx_hist_slab = NULL;
         }
 }