summaryrefslogtreecommitdiffstats
path: root/net/core/datagram.c
diff options
context:
space:
mode:
authorJonathan Lemon <jonathan.lemon@gmail.com>2019-07-30 07:40:33 -0700
committerDavid S. Miller <davem@davemloft.net>2019-07-30 14:21:32 -0700
commitb54c9d5bd6e38edac9ce3a3f95f14a1292b5268d (patch)
treeb09848a92e53ce9533b4df27953ef59874080b53 /net/core/datagram.c
parent7240b60c98d6309363a9f8d5a4ecd5b0626f2aff (diff)
downloadlinux-stable-b54c9d5bd6e38edac9ce3a3f95f14a1292b5268d.tar.gz
linux-stable-b54c9d5bd6e38edac9ce3a3f95f14a1292b5268d.tar.bz2
linux-stable-b54c9d5bd6e38edac9ce3a3f95f14a1292b5268d.zip
net: Use skb_frag_off accessors
Use accessor functions for skb fragment's page_offset instead of direct references, in preparation for bvec conversion. Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/datagram.c')
-rw-r--r--net/core/datagram.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 45a162ef5e02..4cc8dc5db2b7 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -442,8 +442,8 @@ static int __skb_datagram_iter(const struct sk_buff *skb, int offset,
if (copy > len)
copy = len;
- n = cb(vaddr + frag->page_offset +
- offset - start, copy, data, to);
+ n = cb(vaddr + skb_frag_off(frag) + offset - start,
+ copy, data, to);
kunmap(page);
offset += n;
if (n != copy)
@@ -573,7 +573,7 @@ int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset,
if (copy > len)
copy = len;
copied = copy_page_from_iter(skb_frag_page(frag),
- frag->page_offset + offset - start,
+ skb_frag_off(frag) + offset - start,
copy, from);
if (copied != copy)
goto fault;