2008-02-06 13:58:00

by Patrick McHardy

[permalink] [raw]
Subject: [HIFN]: Fix invalid config ifdefs for RNG support

commit 3810a091ff8bc9b5038647a4b32a08267284f3f9
Author: Patrick McHardy <[email protected]>
Date: Wed Feb 6 14:56:09 2008 +0100

[HIFN]: Fix invalid config ifdefs for RNG support

The CRYPTO_DEV_HIFN_795X_RNG ifdefs are missing the CONFIG_ prefix.

Signed-off-by: Patrick McHardy <[email protected]>

diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index dfbf24c..3110bf7 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -463,7 +463,7 @@ struct hifn_device

unsigned int pk_clk_freq;

-#ifdef CRYPTO_DEV_HIFN_795X_RNG
+#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG
unsigned int rng_wait_time;
ktime_t rngtime;
struct hwrng rng;
@@ -795,7 +795,7 @@ static struct pci2id {
}
};

-#ifdef CRYPTO_DEV_HIFN_795X_RNG
+#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG
static int hifn_rng_data_present(struct hwrng *rng, int wait)
{
struct hifn_device *dev = (struct hifn_device *)rng->priv;
@@ -880,7 +880,7 @@ static int hifn_init_pubrng(struct hifn_device *dev)
dprintk("Chip %s: RNG engine has been successfully initialised.\n",
dev->name);

-#ifdef CRYPTO_DEV_HIFN_795X_RNG
+#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG
/* First value must be discarded */
hifn_read_1(dev, HIFN_1_RNG_DATA);
dev->rngtime = ktime_get();

Attachments:
x (1.27 kB)

2008-02-07 15:00:22

by Herbert Xu

[permalink] [raw]
Subject: Re: [HIFN]: Fix invalid config ifdefs for RNG support

On Wed, Feb 06, 2008 at 02:57:57PM +0100, Patrick McHardy wrote:

> commit 3810a091ff8bc9b5038647a4b32a08267284f3f9
> Author: Patrick McHardy <[email protected]>
> Date: Wed Feb 6 14:56:09 2008 +0100
>
> [HIFN]: Fix invalid config ifdefs for RNG support
>
> The CRYPTO_DEV_HIFN_795X_RNG ifdefs are missing the CONFIG_ prefix.
>
> Signed-off-by: Patrick McHardy <[email protected]>

Patch applied. Thanks Patrick!

I'll push this for 2.6.25.

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