Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 408dadf0 authored by Ian Campbell's avatar Ian Campbell Committed by David S. Miller
Browse files

net: ipv6: convert to SKB frag APIs 



Signed-off-by: default avatarIan 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: default avatarDavid S. Miller <davem@davemloft.net>
parent aff65da0

net/ipv6/ip6_output.c

+4 −3
Original line number Diff line number Diff line
@@ -1480,13 +1480,13 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, 
			if (page && (left = PAGE_SIZE - off) > 0) {

				if (copy >= left)

					copy = left;

				if (page != frag->page) {

				if (page != skb_frag_page(frag)) {

					if (i == MAX_SKB_FRAGS) {

						err = -EMSGSIZE;

						goto error;

					}

					get_page(page);

					skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0);

					skb_frag_ref(skb, i);

					frag = &skb_shinfo(skb)->frags[i];

				}

			} else if(i < MAX_SKB_FRAGS) {
@@ -1506,7 +1506,8 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, 
				err = -EMSGSIZE;

				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;

				goto error;

			}