[NET]: Clean up sk_buff walkers.

[karo-tx-linux.git] / net / core / user_dma.c

diff --git a/net/core/user_dma.c b/net/core/user_dma.c
index 248a6b666aff396233020e46ea56a9d2d14d8885..89241cdeea3f7afe7af57a374da0baeae92f536e 100644 (file)
--- a/net/core/user_dma.c
+++ b/net/core/user_dma.c
@@ -49,8 +49,8 @@ int dma_skb_copy_datagram_iovec(struct dma_chan *chan,
                        struct sk_buff *skb, int offset, struct iovec *to,
                        size_t len, struct dma_pinned_list *pinned_list)
 {
-       int start = skb_headlen(skb);
-       int i, copy = start - offset;
+       int end = skb_headlen(skb);
+       int i, copy = end - offset;
        dma_cookie_t cookie = 0;
 
        /* Copy header. */
@@ -58,7 +58,7 @@ int dma_skb_copy_datagram_iovec(struct dma_chan *chan,
                if (copy > len)
                        copy = len;
                cookie = dma_memcpy_to_iovec(chan, to, pinned_list,
-                                           skb->data + offset, copy);
+                                           skb->data + offset, copy);
                if (cookie < 0)
                        goto fault;
                len -= copy;
@@ -69,11 +69,9 @@ int dma_skb_copy_datagram_iovec(struct dma_chan *chan,
 
        /* Copy paged appendix. Hmm... why does this look so complicated? */
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-               int end;
+               BUG_TRAP(len >= 0);
 
-               BUG_TRAP(start <= offset + len);
-
-               end = start + skb_shinfo(skb)->frags[i].size;
+               end = offset + skb_shinfo(skb)->frags[i].size;
                copy = end - offset;
                if ((copy = end - offset) > 0) {
                        skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
@@ -82,8 +80,8 @@ int dma_skb_copy_datagram_iovec(struct dma_chan *chan,
                        if (copy > len)
                                copy = len;
 
-                       cookie = dma_memcpy_pg_to_iovec(chan, to, pinned_list, page,
-                                       frag->page_offset + offset - start, copy);
+                       cookie = dma_memcpy_pg_to_iovec(chan, to, pinned_list,
+                                       page, frag->page_offset, copy);
                        if (cookie < 0)
                                goto fault;
                        len -= copy;
@@ -91,25 +89,21 @@ int dma_skb_copy_datagram_iovec(struct dma_chan *chan,
                                goto end;
                        offset += copy;
                }
-               start = end;
        }
 
        if (skb_shinfo(skb)->frag_list) {
                struct sk_buff *list = skb_shinfo(skb)->frag_list;
 
                for (; list; list = list->next) {
-                       int end;
-
-                       BUG_TRAP(start <= offset + len);
+                       BUG_TRAP(len >= 0);
 
-                       end = start + list->len;
+                       end = offset + 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);
+                                               0, to, copy, pinned_list);
                                if (cookie < 0)
                                        goto fault;
                                len -= copy;
@@ -117,7 +111,6 @@ int dma_skb_copy_datagram_iovec(struct dma_chan *chan,
                                        goto end;
                                offset += copy;
                        }
-                       start = end;
                }
        }
 
@@ -128,5 +121,5 @@ end:
        }
 
 fault:
-       return -EFAULT;
+       return -EFAULT;
 }