From 92a99bf3bae7c1267db87bb3e3babda2c6dcc8a7 Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@suug.ch>
Date: Wed, 29 Jul 2015 09:45:40 +0200
Subject: [PATCH] lwtunnel: Make lwtun_encaps[] static
Any external user should use the registration API instead of
accessing this directly.
Cc: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
include/net/lwtunnel.h | 3 ---
net/core/lwtunnel.c | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/include/net/lwtunnel.h b/include/net/lwtunnel.h
index b02039081b048..33bd30963a95a 100644
--- a/include/net/lwtunnel.h
+++ b/include/net/lwtunnel.h
@@ -31,9 +31,6 @@ struct lwtunnel_encap_ops {
int (*cmp_encap)(struct lwtunnel_state *a, struct lwtunnel_state *b);
};
-extern const struct lwtunnel_encap_ops __rcu *
- lwtun_encaps[LWTUNNEL_ENCAP_MAX+1];
-
#ifdef CONFIG_LWTUNNEL
static inline struct lwtunnel_state *
lwtstate_get(struct lwtunnel_state *lws)
diff --git a/net/core/lwtunnel.c b/net/core/lwtunnel.c
index 5f7fae70ef681..c240c895b319b 100644
--- a/net/core/lwtunnel.c
+++ b/net/core/lwtunnel.c
@@ -37,7 +37,7 @@ struct lwtunnel_state *lwtunnel_state_alloc(int encap_len)
}
EXPORT_SYMBOL(lwtunnel_state_alloc);
-const struct lwtunnel_encap_ops __rcu *
+static const struct lwtunnel_encap_ops __rcu *
lwtun_encaps[LWTUNNEL_ENCAP_MAX + 1] __read_mostly;
int lwtunnel_encap_add_ops(const struct lwtunnel_encap_ops *ops,
--
GitLab