Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 22 insertions, 24 deletions

diff --git a/net/core/user_dma.c b/net/core/user_dma.c
index 164b090d5ac3..25d717ebc92e 100644
--- a/net/core/user_dma.c
+++ b/net/core/user_dma.c
@@ -51,6 +51,7 @@ int dma_skb_copy_datagram_iovec(struct dma_chan *chan,
 {
         int start = skb_headlen(skb);
         int i, copy = start - offset;
+        struct sk_buff *frag_iter;
         dma_cookie_t cookie = 0;
 
         /* Copy header. */
@@ -94,31 +95,28 @@ int dma_skb_copy_datagram_iovec(struct dma_chan *chan,
                 start = end;
         }
 
-        if (skb_shinfo(skb)->frag_list) {
-                struct sk_buff *list = skb_shinfo(skb)->frag_list;
-
-                for (; list; list = list->next) {
-                        int end;
-
-                        WARN_ON(start > offset + len);
-
-                        end = start + list->len;
-                        copy = end - offset;
-                        if (copy > 0) {
-                                if (copy > len)
-                                        copy = len;
-                                cookie = dma_skb_copy_datagram_iovec(chan, list,
-                                                offset - start, to, copy,
-                                                pinned_list);
-                                if (cookie < 0)
-                                        goto fault;
-                                len -= copy;
-                                if (len == 0)
-                                        goto end;
-                                offset += copy;
-                        }
-                        start = end;
+        skb_walk_frags(skb, frag_iter) {
+                int end;
+
+                WARN_ON(start > offset + len);
+
+                end = start + frag_iter->len;
+                copy = end - offset;
+                if (copy > 0) {
+                        if (copy > len)
+                                copy = len;
+                        cookie = dma_skb_copy_datagram_iovec(chan, frag_iter,
+                                                             offset - start,
+                                                             to, copy,
+                                                             pinned_list);
+                        if (cookie < 0)
+                                goto fault;
+                        len -= copy;
+                        if (len == 0)
+                                goto end;
+                        offset += copy;
                 }
+                start = end;
         }
 
 end: