lwtunnel: Make lwtun_encaps[] static

tgraf · davem330 · commit 92a99bf3bae7 · 2015-07-29T22:59:39.000-07:00
Any external user should use the registration API instead of
accessing this directly.

Cc: Roopa Prabhu &lt;roopa@cumulusnetworks.com&gt;
Signed-off-by: Thomas Graf &lt;tgraf@suug.ch&gt;
Acked-by: Roopa Prabhu &lt;roopa@cumulusnetworks.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ struct lwtunnel_state *lwtunnel_state_alloc(int encap_len)`
`37`	`37`	`}`
`38`	`38`	`EXPORT_SYMBOL(lwtunnel_state_alloc);`
`39`	`39`
`40`		`-const struct lwtunnel_encap_ops __rcu *`
	`40`	`+static const struct lwtunnel_encap_ops __rcu *`
`41`	`41`	`lwtun_encaps[LWTUNNEL_ENCAP_MAX + 1] __read_mostly;`
`42`	`42`
`43`	`43`	`int lwtunnel_encap_add_ops(const struct lwtunnel_encap_ops *ops,`