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

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

net: ipv4: 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 ea2ab693

net/ipv4/inet_lro.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static struct sk_buff *__lro_proc_segment(struct net_lro_mgr *lro_mgr, 
	if (!lro_mgr->get_frag_header ||

	    lro_mgr->get_frag_header(frags, (void *)&mac_hdr, (void *)&iph,

				     (void *)&tcph, &flags, priv)) {

		mac_hdr = page_address(frags->page) + frags->page_offset;

		mac_hdr = skb_frag_address(frags);

		goto out1;

	}

net/ipv4/ip_output.c

+4 −3
Original line number Diff line number Diff line
@@ -989,13 +989,13 @@ static int __ip_append_data(struct sock *sk, 
			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, off, 0);

					skb_frag_ref(skb, i);

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

				}

			} else if (i < MAX_SKB_FRAGS) {
@@ -1015,7 +1015,8 @@ static int __ip_append_data(struct sock *sk, 
				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;

			}

net/ipv4/tcp.c

+2 −1
Original line number Diff line number Diff line
@@ -3035,7 +3035,8 @@ int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *hp, 


	for (i = 0; i < shi->nr_frags; ++i) {

		const struct skb_frag_struct *f = &shi->frags[i];

		sg_set_page(&sg, f->page, f->size, f->page_offset);

		struct page *page = skb_frag_page(f);

		sg_set_page(&sg, page, f->size, f->page_offset);

		if (crypto_hash_update(desc, &sg, f->size))

			return 1;

	}

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ static void __pskb_trim_head(struct sk_buff *skb, int len) 
	k = 0;

	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

		if (skb_shinfo(skb)->frags[i].size <= eat) {

			put_page(skb_shinfo(skb)->frags[i].page);

			skb_frag_unref(skb, i);

			eat -= skb_shinfo(skb)->frags[i].size;

		} else {

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