lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source
This commit is contained in:
Linus Torvalds
2005-09-05 00:11:50 -07:00
parent 3863e72414 d70063c463
commit 48467641bc
43 changed files with 405 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/airo.c
View File

@ -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 );