From 7a8d45874ec26526fb18fb61d67d2fc94def3ec6 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 9 Jun 2009 00:19:10 -0700
Subject: [PATCH] --- yaml --- r: 150761 b: refs/heads/master c:
 285e42802bb3da91102967f63fb9e28e61f7831e h: refs/heads/master i:   150759:
 6caa2c97655ec1e8484699bbe220d0df7fe64666 v: v3

---
 [refs]                    |  2 +-
 trunk/net/core/user_dma.c | 46 +++++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index c80ac0fe1c4a..6651ea92c4d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbb398a832086c370bce47789e155bf5a08774e9
+refs/heads/master: 285e42802bb3da91102967f63fb9e28e61f7831e
diff --git a/trunk/net/core/user_dma.c b/trunk/net/core/user_dma.c
index 164b090d5ac3..25d717ebc92e 100644
--- a/trunk/net/core/user_dma.c
+++ b/trunk/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: