Subject: [RFC 1/2] [XFRM] remove ifdef crypto

and select the crypto subsystem if neccessary

Signed-off-by: Sebastian Siewior <[email protected]>
---
net/xfrm/Kconfig | 1 +
net/xfrm/xfrm_algo.c | 2 --
2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig
index 577a4f8..74ab643 100644
--- a/net/xfrm/Kconfig
+++ b/net/xfrm/Kconfig
@@ -3,6 +3,7 @@
#
config XFRM
bool
+ select CRYPTO
depends on NET

config XFRM_USER
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 1686f64..b5c5347 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -486,7 +486,6 @@ EXPORT_SYMBOL_GPL(xfrm_ealg_get_byidx);
*/
void xfrm_probe_algs(void)
{
-#ifdef CONFIG_CRYPTO
int i, status;

BUG_ON(in_softirq());
@@ -511,7 +510,6 @@ void xfrm_probe_algs(void)
if (calg_list[i].available != status)
calg_list[i].available = status;
}
-#endif
}
EXPORT_SYMBOL_GPL(xfrm_probe_algs);

--
1.5.3.7


2008-01-08 06:13:53

by Herbert Xu

[permalink] [raw]
Subject: Re: [RFC 1/2] [XFRM] remove ifdef crypto

On Sat, Jan 05, 2008 at 01:36:37PM +0100, Sebastian Siewior wrote:
> and select the crypto subsystem if neccessary
>
> Signed-off-by: Sebastian Siewior <[email protected]>

Could you please resend this patch to David Miller and cc netdev?

I'll merge the other once this one is in Linus's tree.

Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Subject: Re: [RFC 1/2] [XFRM] remove ifdef crypto

* Herbert Xu | 2008-01-08 17:13:50 [+1100]:

>On Sat, Jan 05, 2008 at 01:36:37PM +0100, Sebastian Siewior wrote:
>> and select the crypto subsystem if neccessary
>>
>> Signed-off-by: Sebastian Siewior <[email protected]>
>
>Could you please resend this patch to David Miller and cc netdev?
yes, np

Sebastian

Subject: Re: [RFC 1/2] [XFRM] remove ifdef crypto

* Herbert Xu | 2008-01-08 17:13:50 [+1100]:

>On Sat, Jan 05, 2008 at 01:36:37PM +0100, Sebastian Siewior wrote:
>> and select the crypto subsystem if neccessary
>>
>> Signed-off-by: Sebastian Siewior <[email protected]>
>
>Could you please resend this patch to David Miller and cc netdev?
>
>I'll merge the other once this one is in Linus's tree.

That is allready in Linus' tree, did you forgot about 2/2?

Sebastian

2008-03-20 01:35:57

by Herbert Xu

[permalink] [raw]
Subject: Re: [RFC 1/2] [XFRM] remove ifdef crypto

On Wed, Mar 19, 2008 at 06:14:29PM +0100, Sebastian Siewior wrote:
> * Herbert Xu | 2008-01-08 17:13:50 [+1100]:
>
> >On Sat, Jan 05, 2008 at 01:36:37PM +0100, Sebastian Siewior wrote:
> >> and select the crypto subsystem if neccessary
> >>
> >> Signed-off-by: Sebastian Siewior <[email protected]>
> >
> >Could you please resend this patch to David Miller and cc netdev?
> >
> >I'll merge the other once this one is in Linus's tree.
>
> That is allready in Linus' tree, did you forgot about 2/2?

Could you please resend 2/2?

Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt