summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorJonathan Lemon <jonathan.lemon@gmail.com>2019-07-30 10:40:33 -0400
committerDavid S. Miller <davem@davemloft.net>2019-07-30 17:21:32 -0400
commitb54c9d5bd6e38edac9ce3a3f95f14a1292b5268d (patch)
treeb09848a92e53ce9533b4df27953ef59874080b53 /net/ipv4/tcp.c
parent7240b60c98d6309363a9f8d5a4ecd5b0626f2aff (diff)
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/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index f62f0e7e3cdd..a0a66321c0ee 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1782,12 +1782,12 @@ static int tcp_zerocopy_receive(struct sock *sk,
1782 frags++; 1782 frags++;
1783 } 1783 }
1784 } 1784 }
1785 if (skb_frag_size(frags) != PAGE_SIZE || frags->page_offset) { 1785 if (skb_frag_size(frags) != PAGE_SIZE || skb_frag_off(frags)) {
1786 int remaining = zc->recv_skip_hint; 1786 int remaining = zc->recv_skip_hint;
1787 int size = skb_frag_size(frags); 1787 int size = skb_frag_size(frags);
1788 1788
1789 while (remaining && (size != PAGE_SIZE || 1789 while (remaining && (size != PAGE_SIZE ||
1790 frags->page_offset)) { 1790 skb_frag_off(frags))) {
1791 remaining -= size; 1791 remaining -= size;
1792 frags++; 1792 frags++;
1793 size = skb_frag_size(frags); 1793 size = skb_frag_size(frags);
@@ -3784,7 +3784,7 @@ int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *hp,
3784 3784
3785 for (i = 0; i < shi->nr_frags; ++i) { 3785 for (i = 0; i < shi->nr_frags; ++i) {
3786 const skb_frag_t *f = &shi->frags[i]; 3786 const skb_frag_t *f = &shi->frags[i];
3787 unsigned int offset = f->page_offset; 3787 unsigned int offset = skb_frag_off(f);
3788 struct page *page = skb_frag_page(f) + (offset >> PAGE_SHIFT); 3788 struct page *page = skb_frag_page(f) + (offset >> PAGE_SHIFT);
3789 3789
3790 sg_set_page(&sg, page, skb_frag_size(f), 3790 sg_set_page(&sg, page, skb_frag_size(f),