diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-04 20:59:19 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-04 20:59:19 +0000 |
| commit | 0f34590d5547059b8a8bd1bd3875f2f663fb1e6e (patch) | |
| tree | e2514d65fed366af6c5f498e58431b2008ccf437 /target/linux/generic-2.6/files/crypto/ocf/ixp4xx/ixp4xx.c | |
| parent | 98af872a32e530441318bba1b73ed15152db8c83 (diff) | |
| download | upstream-0f34590d5547059b8a8bd1bd3875f2f663fb1e6e.tar.gz upstream-0f34590d5547059b8a8bd1bd3875f2f663fb1e6e.tar.bz2 upstream-0f34590d5547059b8a8bd1bd3875f2f663fb1e6e.zip | |
[generic-2.6] update OCF framework to version 20100325
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21356 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/files/crypto/ocf/ixp4xx/ixp4xx.c')
| -rw-r--r-- | target/linux/generic-2.6/files/crypto/ocf/ixp4xx/ixp4xx.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ixp4xx/ixp4xx.c b/target/linux/generic-2.6/files/crypto/ocf/ixp4xx/ixp4xx.c index fba31b000b..d5414a4ef5 100644 --- a/target/linux/generic-2.6/files/crypto/ocf/ixp4xx/ixp4xx.c +++ b/target/linux/generic-2.6/files/crypto/ocf/ixp4xx/ixp4xx.c @@ -3,8 +3,8 @@ * This driver requires the IXP400 Access Library that is available * from Intel in order to operate (or compile). * - * Written by David McCullough <david_mccullough@securecomputing.com> - * Copyright (C) 2006-2007 David McCullough + * Written by David McCullough <david_mccullough@mcafee.com> + * Copyright (C) 2006-2010 David McCullough * Copyright (C) 2004-2005 Intel Corporation. * * LICENSE TERMS @@ -373,9 +373,6 @@ ixp_freesession(device_t dev, u_int64_t tid) ixCryptoAccCtxUnregister(ixp_sessions[sid]->ixp_ctx_id); ixp_sessions[sid]->ixp_ctx_id = -1; } - - flush_scheduled_work(); - kfree(ixp_sessions[sid]); } ixp_sessions[sid] = NULL; @@ -595,8 +592,7 @@ ixp_process_pending(void *arg) static void ixp_process_pending_wq(struct work_struct *work) { - struct ixp_data *ixp = container_of(work, struct ixp_data, - ixp_pending_work); + struct ixp_data *ixp = container_of(work, struct ixp_data, ixp_pending_work); ixp_process_pending(ixp); } #endif |