ocf-linux: version bump to 20110720

[15.05/openwrt.git] / target / linux / generic / files / crypto / ocf / kirkwood / cesa_ocf_drv.c

diff --git a/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c b/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c
index ccf9227..1d889ff 100644 (file)
--- a/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c
+++ b/target/linux/generic/files/crypto/ocf/kirkwood/cesa_ocf_drv.c
@@ -26,7 +26,8 @@ DISCLAIMED.  The GPL License provides additional details about this warranty
 disclaimer.
 *******************************************************************************/
 
-#ifndef AUTOCONF_INCLUDED
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED)
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
@@ -498,7 +499,7 @@ cesa_ocf_process(device_t dev, struct cryptop *crp, int hint)
                                        if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
                                                dprintk("%s,%d: copy the IV back to the buffer\n", __FILE__, __LINE__);
                                                cesa_cmd->ivOffset = crd->crd_inject;
-                                               crypto_copy_bits_back(crp->crp_buf, crd->crd_inject, ivp, cesa_ocf_cur_ses->ivlen);
+                                               crypto_copyback(crp->crp_flags, crp->crp_buf, crd->crd_inject, cesa_ocf_cur_ses->ivlen, ivp);
                                        }
                                        else {
                                                dprintk("%s,%d: don't copy the IV back to the buffer \n", __FILE__, __LINE__);