X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0d10d61ac3f48e144e7d1d88efb445c5a763c66a..e660b7606b6de0dacd84f433dcaaa9d4015e1da4:/target/linux/generic/files/crypto/ocf/criov.c diff --git a/target/linux/generic/files/crypto/ocf/criov.c b/target/linux/generic/files/crypto/ocf/criov.c index e1b159fb4..cdc731e29 100644 --- a/target/linux/generic/files/crypto/ocf/criov.c +++ b/target/linux/generic/files/crypto/ocf/criov.c @@ -35,10 +35,8 @@ __FBSDID("$FreeBSD: src/sys/opencrypto/criov.c,v 1.5 2006/06/04 22:15:13 pjd Exp */ #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) -#include -#else -#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) && !defined(AUTOCONF_INCLUDED) +#include #endif #include #include @@ -158,7 +156,7 @@ skb_copy_bits_back(struct sk_buff *skb, int offset, caddr_t cp, int len) offset -= skb_headlen(skb); for (i = 0; len > 0 && i < skb_shinfo(skb)->nr_frags; i++) { if (offset < skb_shinfo(skb)->frags[i].size) { - memcpy(page_address(skb_shinfo(skb)->frags[i].page) + + memcpy(page_address(skb_frag_page(&skb_shinfo(skb)->frags[i])) + skb_shinfo(skb)->frags[i].page_offset, cp, min_t(int, skb_shinfo(skb)->frags[i].size, len)); len -= skb_shinfo(skb)->frags[i].size;