xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: Use skb_frag_off accessors

Browse Source 
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>
This commit is contained in:
Jonathan Lemon
2019-07-30 07:40:33 -07:00
committed by David S. Miller
parent 7240b60c98
commit b54c9d5bd6
44 changed files with 100 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/tcp.c
View File

@@ -1782,12 +1782,12 @@ static int tcp_zerocopy_receive(struct sock *sk,
frags++;
}
}
if (skb_frag_size(frags) != PAGE_SIZE || frags->page_offset) {
if (skb_frag_size(frags) != PAGE_SIZE || skb_frag_off(frags)) {
int remaining = zc->recv_skip_hint;
int size = skb_frag_size(frags);
while (remaining && (size != PAGE_SIZE ||
frags->page_offset)) {
skb_frag_off(frags))) {
remaining -= size;
frags++;
size = skb_frag_size(frags);
@@ -3784,7 +3784,7 @@ int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *hp,
for (i = 0; i < shi->nr_frags; ++i) {
const skb_frag_t *f = &shi->frags[i];
unsigned int offset = f->page_offset;
unsigned int offset = skb_frag_off(f);
struct page *page = skb_frag_page(f) + (offset >> PAGE_SHIFT);
sg_set_page(&sg, page, skb_frag_size(f),

2
net/ipv4/tcp_output.c
View File

@@ -1402,7 +1402,7 @@ static int __pskb_trim_head(struct sk_buff *skb, int len)
} else {
shinfo->frags[k] = shinfo->frags[i];
if (eat) {
shinfo->frags[k].page_offset += eat;
skb_frag_off_add(&shinfo->frags[k], eat);
skb_frag_size_sub(&shinfo->frags[k], eat);
eat = 0;
}