diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 14:16:43 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 14:16:43 +0900 |
| commit | d4d9781d1dd04ff134e3d43383dfa9991f7c54c6 (patch) | |
| tree | 28e799ec49f72bf37f39d192d21f25bffb682aab /net/appletalk | |
| parent | f5a18f932e051ff0f19dcd80a421a4dd9b11f10f (diff) | |
| parent | 396e6e49c58bb23d1814d3c240c736c9f01523c5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Diffstat (limited to 'net/appletalk')
| -rw-r--r-- | net/appletalk/ddp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index b1fe7c35e8d..bfa9ab93eda 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -951,13 +951,12 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset, /* checksum stuff in frags */ for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { int end; - + const skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; WARN_ON(start > offset + len); - end = start + skb_shinfo(skb)->frags[i].size; + end = start + skb_frag_size(frag); if ((copy = end - offset) > 0) { u8 *vaddr; - skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; if (copy > len) copy = len; |