diff mbox

[net-next] lwtunnel: Make lwtun_encaps[] static

Message ID 66e6473d98879c465cf4965d44230374c716ed25.1438155918.git.tgraf@suug.ch
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Thomas Graf July 29, 2015, 7:45 a.m. UTC
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>
---
 include/net/lwtunnel.h | 3 ---
 net/core/lwtunnel.c    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

Comments

Roopa Prabhu July 29, 2015, 7:35 p.m. UTC | #1
On 7/29/15, 12:45 AM, Thomas Graf wrote:
> 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>

thanks.
> ---
>   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 b020390..33bd309 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 5f7fae7..c240c89 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,

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller July 30, 2015, 5:59 a.m. UTC | #2
From: Thomas Graf <tgraf@suug.ch>
Date: Wed, 29 Jul 2015 09:45:40 +0200

> 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>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/net/lwtunnel.h b/include/net/lwtunnel.h
index b020390..33bd309 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 5f7fae7..c240c89 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,