Skip to content

L
linux-davinci
Commit 5b1a002a authored by David S. Miller's avatar David S. Miller
Browse files
Options

datagram: Use frag list abstraction interfaces. 

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c32ba3f9
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 95 deletions
net/core/datagram.c
View file @ 5b1a002a
...@@ -282,6 +282,7 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset, ...@@ -282,6 +282,7 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
{ {
int start = skb_headlen(skb); int start = skb_headlen(skb);
int i, copy = start - offset; int i, copy = start - offset;
struct sk_buff *frag_iter;
/* Copy header. */ /* Copy header. */
if (copy > 0) { if (copy > 0) {
...@@ -322,28 +323,24 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset, ...@@ -322,28 +323,24 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
start = end; start = end;
} }
if (skb_shinfo(skb)->frag_list) { skb_walk_frags(skb, frag_iter) {
struct sk_buff *list = skb_shinfo(skb)->frag_list; int end;
for (; list; list = list->next) { WARN_ON(start > offset + len);
int end;
end = start + frag_iter->len;
WARN_ON(start > offset + len); if ((copy = end - offset) > 0) {
if (copy > len)
end = start + list->len; copy = len;
if ((copy = end - offset) > 0) { if (skb_copy_datagram_iovec(frag_iter,
if (copy > len) offset - start,
copy = len; to, copy))
if (skb_copy_datagram_iovec(list, goto fault;
offset - start, if ((len -= copy) == 0)
to, copy)) return 0;
goto fault; offset += copy;
if ((len -= copy) == 0)
return 0;
offset += copy;
}
start = end;
} }
start = end;
} }
if (!len) if (!len)
return 0; return 0;
...@@ -369,6 +366,7 @@ int skb_copy_datagram_const_iovec(const struct sk_buff *skb, int offset, ...@@ -369,6 +366,7 @@ int skb_copy_datagram_const_iovec(const struct sk_buff *skb, int offset,
{ {
int start = skb_headlen(skb); int start = skb_headlen(skb);
int i, copy = start - offset; int i, copy = start - offset;
struct sk_buff *frag_iter;
/* Copy header. */ /* Copy header. */
if (copy > 0) { if (copy > 0) {
...@@ -411,30 +409,26 @@ int skb_copy_datagram_const_iovec(const struct sk_buff *skb, int offset, ...@@ -411,30 +409,26 @@ int skb_copy_datagram_const_iovec(const struct sk_buff *skb, int offset,
start = end; start = end;
} }
if (skb_shinfo(skb)->frag_list) { skb_walk_frags(skb, frag_iter) {
struct sk_buff *list = skb_shinfo(skb)->frag_list; int end;
for (; list; list = list->next) { WARN_ON(start > offset + len);
int end;
end = start + frag_iter->len;
WARN_ON(start > offset + len); if ((copy = end - offset) > 0) {
if (copy > len)
end = start + list->len; copy = len;
if ((copy = end - offset) > 0) { if (skb_copy_datagram_const_iovec(frag_iter,
if (copy > len) offset - start,
copy = len; to, to_offset,
if (skb_copy_datagram_const_iovec(list, copy))
offset - start, goto fault;
to, to_offset, if ((len -= copy) == 0)
copy)) return 0;
goto fault; offset += copy;
if ((len -= copy) == 0) to_offset += copy;
return 0;
offset += copy;
to_offset += copy;
}
start = end;
} }
start = end;
} }
if (!len) if (!len)
return 0; return 0;
...@@ -461,6 +455,7 @@ int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset, ...@@ -461,6 +455,7 @@ int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset,
{ {
int start = skb_headlen(skb); int start = skb_headlen(skb);
int i, copy = start - offset; int i, copy = start - offset;
struct sk_buff *frag_iter;
/* Copy header. */ /* Copy header. */
if (copy > 0) { if (copy > 0) {
...@@ -506,31 +501,27 @@ int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset, ...@@ -506,31 +501,27 @@ int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset,
start = end; start = end;
} }
if (skb_shinfo(skb)->frag_list) { skb_walk_frags(skb, frag_iter) {
struct sk_buff *list = skb_shinfo(skb)->frag_list; int end;
for (; list; list = list->next) { WARN_ON(start > offset + len);
int end;
end = start + frag_iter->len;
WARN_ON(start > offset + len); if ((copy = end - offset) > 0) {
if (copy > len)
end = start + list->len; copy = len;
if ((copy = end - offset) > 0) { if (skb_copy_datagram_from_iovec(frag_iter,
if (copy > len) offset - start,
copy = len; from,
if (skb_copy_datagram_from_iovec(list, from_offset,
offset - start, copy))
from, goto fault;
from_offset, if ((len -= copy) == 0)
copy)) return 0;
goto fault; offset += copy;
if ((len -= copy) == 0) from_offset += copy;
return 0;
offset += copy;
from_offset += copy;
}
start = end;
} }
start = end;
} }
if (!len) if (!len)
return 0; return 0;
...@@ -545,8 +536,9 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, ...@@ -545,8 +536,9 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,
__wsum *csump) __wsum *csump)
{ {
int start = skb_headlen(skb); int start = skb_headlen(skb);
int pos = 0;
int i, copy = start - offset; int i, copy = start - offset;
struct sk_buff *frag_iter;
int pos = 0;
/* Copy header. */ /* Copy header. */
if (copy > 0) { if (copy > 0) {
...@@ -597,33 +589,29 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, ...@@ -597,33 +589,29 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,
start = end; start = end;
} }
if (skb_shinfo(skb)->frag_list) { skb_walk_frags(skb, frag_iter) {
struct sk_buff *list = skb_shinfo(skb)->frag_list; int end;
for (; list; list=list->next) { WARN_ON(start > offset + len);
int end;
end = start + frag_iter->len;
WARN_ON(start > offset + len); if ((copy = end - offset) > 0) {
__wsum csum2 = 0;
end = start + list->len; if (copy > len)
if ((copy = end - offset) > 0) { copy = len;
__wsum csum2 = 0; if (skb_copy_and_csum_datagram(frag_iter,
if (copy > len) offset - start,
copy = len; to, copy,
if (skb_copy_and_csum_datagram(list, &csum2))
offset - start, goto fault;
to, copy, *csump = csum_block_add(*csump, csum2, pos);
&csum2)) if ((len -= copy) == 0)
goto fault; return 0;
*csump = csum_block_add(*csump, csum2, pos); offset += copy;
if ((len -= copy) == 0) to += copy;
return 0; pos += copy;
offset += copy;
to += copy;
pos += copy;
}
start = end;
} }
start = end;
} }
if (!len) if (!len)
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment