diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 09:11:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 09:11:50 +0200 |
| commit | 48467641bcc057f7cba3b6cbbe66cb834d64cc81 (patch) | |
| tree | f7c5c5e964c220de30fcdcd06b0f1efdb3e22439 /drivers/net/wireless/airo.c | |
| parent | [PATCH] s390: disconnected 3270 console (diff) | |
| parent | [ATM]: Fix dereference of uninitialized pointer in zatm (diff) | |
| download | linux-48467641bcc057f7cba3b6cbbe66cb834d64cc81.tar.xz linux-48467641bcc057f7cba3b6cbbe66cb834d64cc81.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index abac1e40154b..dbcb5a8a2194 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -1308,7 +1308,7 @@ static int micsetup(struct airo_info *ai) { int i; if (ai->tfm == NULL) - ai->tfm = crypto_alloc_tfm("aes", 0); + ai->tfm = crypto_alloc_tfm("aes", CRYPTO_TFM_REQ_MAY_SLEEP); if (ai->tfm == NULL) { printk(KERN_ERR "airo: failed to load transform for AES\n"); @@ -2410,8 +2410,7 @@ void stop_airo_card( struct net_device *dev, int freeres ) } } #ifdef MICSUPPORT - if (ai->tfm) - crypto_free_tfm(ai->tfm); + crypto_free_tfm(ai->tfm); #endif del_airo_dev( dev ); free_netdev( dev ); |