These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / crypto / scatterwalk.h

diff --git a/kernel/include/crypto/scatterwalk.h b/kernel/include/crypto/scatterwalk.h
index 20e4226..35f99b6 100644 (file)
--- a/kernel/include/crypto/scatterwalk.h
+++ b/kernel/include/crypto/scatterwalk.h
@@ -25,14 +25,6 @@
 #include <linux/scatterlist.h>
 #include <linux/sched.h>
 
-static inline void scatterwalk_sg_chain(struct scatterlist *sg1, int num,
-                                       struct scatterlist *sg2)
-{
-       sg_set_page(&sg1[num - 1], (void *)sg2, 0, 0);
-       sg1[num - 1].page_link &= ~0x02;
-       sg1[num - 1].page_link |= 0x01;
-}
-
 static inline void scatterwalk_crypto_chain(struct scatterlist *head,
                                            struct scatterlist *sg,
                                            int chain, int num)
@@ -43,7 +35,7 @@ static inline void scatterwalk_crypto_chain(struct scatterlist *head,
        }
 
        if (sg)
-               scatterwalk_sg_chain(head, num, sg);
+               sg_chain(head, num, sg);
        else
                sg_mark_end(head);
 }
@@ -102,4 +94,8 @@ void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,
 
 int scatterwalk_bytes_sglen(struct scatterlist *sg, int num_bytes);
 
+struct scatterlist *scatterwalk_ffwd(struct scatterlist dst[2],
+                                    struct scatterlist *src,
+                                    unsigned int len);
+
 #endif  /* _CRYPTO_SCATTERWALK_H */