OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

datagram: Use frag list abstraction interfaces. 

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2009-06-09 00:18:15 -07:00
parent c32ba3f9b8
commit 5b1a002ade
1 changed files with 75 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
net/core/datagram.c
View File

@ -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,
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;
WARN_ON(start > offset + len); end = start + frag_iter->len;
if ((copy = end - offset) > 0) {
end = start + list->len; if (copy > len)
if ((copy = end - offset) > 0) { copy = len;
if (copy > len) if (skb_copy_datagram_iovec(frag_iter,
copy = len; offset - start,
if (skb_copy_datagram_iovec(list, to, copy))
offset - start, goto fault;
to, copy)) if ((len -= copy) == 0)
goto fault; return 0;
if ((len -= copy) == 0) offset += copy;
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,
{ {
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,
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;
WARN_ON(start > offset + len); end = start + frag_iter->len;
if ((copy = end - offset) > 0) {
end = start + list->len; if (copy > len)
if ((copy = end - offset) > 0) { copy = len;
if (copy > len) if (skb_copy_datagram_const_iovec(frag_iter,
copy = len; offset - start,
if (skb_copy_datagram_const_iovec(list, to, to_offset,
offset - start, copy))
to, to_offset, goto fault;
copy)) if ((len -= copy) == 0)
goto fault; return 0;
if ((len -= copy) == 0) offset += copy;
return 0; to_offset += copy;
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,
{ {
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,
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;
WARN_ON(start > offset + len); end = start + frag_iter->len;
if ((copy = end - offset) > 0) {
end = start + list->len; if (copy > len)
if ((copy = end - offset) > 0) { copy = len;
if (copy > len) if (skb_copy_datagram_from_iovec(frag_iter,
copy = len; offset - start,
if (skb_copy_datagram_from_iovec(list, from,
offset - start, from_offset,
from, copy))
from_offset, goto fault;
copy)) if ((len -= copy) == 0)
goto fault; return 0;
if ((len -= copy) == 0) offset += copy;
return 0; from_offset += copy;
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,
__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,
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;
WARN_ON(start > offset + len); end = start + frag_iter->len;
if ((copy = end - offset) > 0) {
end = start + list->len; __wsum csum2 = 0;
if ((copy = end - offset) > 0) { if (copy > len)
__wsum csum2 = 0; copy = len;
if (copy > len) if (skb_copy_and_csum_datagram(frag_iter,
copy = len; offset - start,
if (skb_copy_and_csum_datagram(list, to, copy,
offset - start, &csum2))
to, copy, goto fault;
&csum2)) *csump = csum_block_add(*csump, csum2, pos);
goto fault; if ((len -= copy) == 0)
*csump = csum_block_add(*csump, csum2, pos); return 0;
if ((len -= copy) == 0) offset += copy;
return 0; to += copy;
offset += copy; pos += copy;
to += copy;
pos += copy;
}
start = end;
} }
start = end;
} }
if (!len) if (!len)
return 0; return 0;