From 7e1525249814acfd293d579abcb6462767643a8a Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 15 May 2012 01:57:44 +0000 Subject: xfrm: make xfrm_algo.c a module By making this a standalone config option (auto-selected as needed), selecting CRYPTO from here rather than from XFRM (which is boolean) allows the core crypto code to become a module again even when XFRM=y. Signed-off-by: Jan Beulich Signed-off-by: David S. Miller --- net/xfrm/xfrm_algo.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'net/xfrm/xfrm_algo.c') diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index 791ab2e77f3f..ecd6d8d8a66c 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c @@ -752,3 +752,5 @@ void *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len) } EXPORT_SYMBOL_GPL(pskb_put); #endif + +MODULE_LICENSE("GPL"); -- cgit v1.2.3 From 71b697fcc7b0a88da5106dd3671d732d0b4360d1 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 15 May 2012 02:00:44 +0000 Subject: xfrm_algo: drop an unnecessary inclusion For several releases, this has not been needed anymore, as no helper functions declared in net/ah.h get implemented by xfrm_algo.c anymore. Signed-off-by: Jan Beulich Signed-off-by: David S. Miller --- net/xfrm/xfrm_algo.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'net/xfrm/xfrm_algo.c') diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index ecd6d8d8a66c..4ce2d93162c1 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c @@ -15,9 +15,6 @@ #include #include #include -#if defined(CONFIG_INET_AH) || defined(CONFIG_INET_AH_MODULE) || defined(CONFIG_INET6_AH) || defined(CONFIG_INET6_AH_MODULE) -#include -#endif #if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE) #include #endif -- cgit v1.2.3