From: Joe Stringer <joe@ovn.org>
Date: Tue, 2 Feb 2016 23:19:00 +0000 (-0800)
Subject: compat: Rename OVS frag caches.
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=63129291a986db37218316a7e11feab7ce87c05f

compat: Rename OVS frag caches.

These should not have the same name as the upstream ones, to reduce
confusion when they are created. Rename them.

Suggested-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
---

diff --git a/datapath/linux/compat/ip_fragment.c b/datapath/linux/compat/ip_fragment.c
index 3815067a9..1841c49b9 100644
--- a/datapath/linux/compat/ip_fragment.c
+++ b/datapath/linux/compat/ip_fragment.c
@@ -64,7 +64,7 @@
  */
 
 static int sysctl_ipfrag_max_dist __read_mostly = 64;
-static const char ip_frag_cache_name[] = "ip4-frags";
+static const char ip_frag_cache_name[] = "ovs-frag4";
 
 struct ipfrag_skb_cb
 {
diff --git a/datapath/linux/compat/nf_conntrack_reasm.c b/datapath/linux/compat/nf_conntrack_reasm.c
index fec9e5794..ef29115b6 100644
--- a/datapath/linux/compat/nf_conntrack_reasm.c
+++ b/datapath/linux/compat/nf_conntrack_reasm.c
@@ -56,7 +56,7 @@
 
 #ifdef OVS_NF_DEFRAG6_BACKPORT
 
-static const char nf_frags_cache_name[] = "nf-frags";
+static const char nf_frags_cache_name[] = "ovs-frag6";
 
 struct nf_ct_frag6_skb_cb
 {