Commit d4fd3bc1 authored by David S. Miller's avatar David S. Miller

xfrm: Use frag list abstraction interfaces.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b003be3
...@@ -696,8 +696,9 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc, ...@@ -696,8 +696,9 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,
{ {
int start = skb_headlen(skb); int start = skb_headlen(skb);
int i, copy = start - offset; int i, copy = start - offset;
int err; struct sk_buff *frag_iter;
struct scatterlist sg; struct scatterlist sg;
int err;
/* Checksum header. */ /* Checksum header. */
if (copy > 0) { if (copy > 0) {
...@@ -742,28 +743,24 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc, ...@@ -742,28 +743,24 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,
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) { err = skb_icv_walk(frag_iter, desc, offset-start,
if (copy > len) copy, icv_update);
copy = len; if (unlikely(err))
err = skb_icv_walk(list, desc, offset-start, return err;
copy, icv_update); if ((len -= copy) == 0)
if (unlikely(err)) return 0;
return err; offset += copy;
if ((len -= copy) == 0)
return 0;
offset += copy;
}
start = end;
} }
start = end;
} }
BUG_ON(len); BUG_ON(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