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
Show 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,19 +323,16 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset, ...@@ -322,19 +323,16 @@ 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;
for (; list; list = list->next) {
int end; int end;
WARN_ON(start > offset + len); WARN_ON(start > offset + len);
end = start + list->len; end = start + frag_iter->len;
if ((copy = end - offset) > 0) { if ((copy = end - offset) > 0) {
if (copy > len) if (copy > len)
copy = len; copy = len;
if (skb_copy_datagram_iovec(list, if (skb_copy_datagram_iovec(frag_iter,
offset - start, offset - start,
to, copy)) to, copy))
goto fault; goto fault;
...@@ -344,7 +342,6 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset, ...@@ -344,7 +342,6 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
} }
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,19 +409,16 @@ int skb_copy_datagram_const_iovec(const struct sk_buff *skb, int offset, ...@@ -411,19 +409,16 @@ 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;
for (; list; list = list->next) {
int end; int end;
WARN_ON(start > offset + len); WARN_ON(start > offset + len);
end = start + list->len; end = start + frag_iter->len;
if ((copy = end - offset) > 0) { if ((copy = end - offset) > 0) {
if (copy > len) if (copy > len)
copy = len; copy = len;
if (skb_copy_datagram_const_iovec(list, if (skb_copy_datagram_const_iovec(frag_iter,
offset - start, offset - start,
to, to_offset, to, to_offset,
copy)) copy))
...@@ -435,7 +430,6 @@ int skb_copy_datagram_const_iovec(const struct sk_buff *skb, int offset, ...@@ -435,7 +430,6 @@ int skb_copy_datagram_const_iovec(const struct sk_buff *skb, int offset,
} }
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,19 +501,16 @@ int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset, ...@@ -506,19 +501,16 @@ 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;
for (; list; list = list->next) {
int end; int end;
WARN_ON(start > offset + len); WARN_ON(start > offset + len);
end = start + list->len; end = start + frag_iter->len;
if ((copy = end - offset) > 0) { if ((copy = end - offset) > 0) {
if (copy > len) if (copy > len)
copy = len; copy = len;
if (skb_copy_datagram_from_iovec(list, if (skb_copy_datagram_from_iovec(frag_iter,
offset - start, offset - start,
from, from,
from_offset, from_offset,
...@@ -531,7 +523,6 @@ int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset, ...@@ -531,7 +523,6 @@ int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset,
} }
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,20 +589,17 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, ...@@ -597,20 +589,17 @@ 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;
for (; list; list=list->next) {
int end; int end;
WARN_ON(start > offset + len); WARN_ON(start > offset + len);
end = start + list->len; end = start + frag_iter->len;
if ((copy = end - offset) > 0) { if ((copy = end - offset) > 0) {
__wsum csum2 = 0; __wsum csum2 = 0;
if (copy > len) if (copy > len)
copy = len; copy = len;
if (skb_copy_and_csum_datagram(list, if (skb_copy_and_csum_datagram(frag_iter,
offset - start, offset - start,
to, copy, to, copy,
&csum2)) &csum2))
...@@ -624,7 +613,6 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, ...@@ -624,7 +613,6 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,
} }
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