evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: ipv6: convert to SKB frag APIs

Browse source 
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: "Pekka Savola (ipv6)" <pekkas@netcore.fi>
Cc: James Morris <jmorris@namei.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ian Campbell 2011-08-22 23:45:00 +00:00 • committed by David S. Miller
parent aff65da0f1
commit 408dadf03f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/ipv6/ip6_output.c
View file

@ -1480,13 +1480,13 @@ alloc_new_skb:
if (page && (left = PAGE_SIZE - off) > 0) { if (page && (left = PAGE_SIZE - off) > 0) {
if (copy >= left) if (copy >= left)
copy = left; copy = left;
if (page != frag->page) { if (page != skb_frag_page(frag)) {
if (i == MAX_SKB_FRAGS) { if (i == MAX_SKB_FRAGS) {
err = -EMSGSIZE; err = -EMSGSIZE;
goto error; goto error;
} }
get_page(page);
skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0); skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0);
skb_frag_ref(skb, i);
frag = &skb_shinfo(skb)->frags[i]; frag = &skb_shinfo(skb)->frags[i];
} }
} else if(i < MAX_SKB_FRAGS) { } else if(i < MAX_SKB_FRAGS) {
@ -1506,7 +1506,8 @@ alloc_new_skb:
err = -EMSGSIZE; err = -EMSGSIZE;
goto error; goto error;
} }
if (getfrag(from, page_address(frag->page)+frag->page_offset+frag->size, offset, copy, skb->len, skb) < 0) { if (getfrag(from, skb_frag_address(frag)+frag->size,
offset, copy, skb->len, skb) < 0) {
err = -EFAULT; err = -EFAULT;
goto error; goto error;
} }