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

Commit 5a2ef920 authored Mar 01, 2011 by Herbert Xu Committed by David S. Miller Mar 01, 2011

inet: Remove unused sk_sndmsg_* from UFO



UFO doesn't really use the sk_sndmsg_* parameters so touching
them is pointless.  It can't use them anyway since the whole
point of UFO is to use the original pages without copying.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9836f408

net/core/skbuff.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2434,8 +2434,6 @@ int skb_append_datato_frags(struct sock sk, struct sk_buff skb,
	return -ENOMEM;		return -ENOMEM;

	/* initialize the next frag */		/* initialize the next frag */
	sk->sk_sndmsg_page = page;
	sk->sk_sndmsg_off = 0;
	skb_fill_page_desc(skb, frg_cnt, page, 0, 0);		skb_fill_page_desc(skb, frg_cnt, page, 0, 0);
	skb->truesize += PAGE_SIZE;		skb->truesize += PAGE_SIZE;
	atomic_add(PAGE_SIZE, &sk->sk_wmem_alloc);		atomic_add(PAGE_SIZE, &sk->sk_wmem_alloc);
	@@ -2455,7 +2453,6 @@ int skb_append_datato_frags(struct sock sk, struct sk_buff skb,
	return -EFAULT;		return -EFAULT;

	/* copy was successful so update the size parameters */		/* copy was successful so update the size parameters */
	sk->sk_sndmsg_off += copy;
	frag->size += copy;		frag->size += copy;
	skb->len += copy;		skb->len += copy;
	skb->data_len += copy;		skb->data_len += copy;

net/ipv4/ip_output.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -767,7 +767,6 @@ static inline int ip_ufo_append_data(struct sock *sk,

	skb->ip_summed = CHECKSUM_PARTIAL;		skb->ip_summed = CHECKSUM_PARTIAL;
	skb->csum = 0;		skb->csum = 0;
	sk->sk_sndmsg_off = 0;

	/* specify the length of each IP datagram fragment */		/* specify the length of each IP datagram fragment */
	skb_shinfo(skb)->gso_size = mtu - fragheaderlen;		skb_shinfo(skb)->gso_size = mtu - fragheaderlen;

net/ipv6/ip6_output.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1061,7 +1061,6 @@ static inline int ip6_ufo_append_data(struct sock *sk,

	skb->ip_summed = CHECKSUM_PARTIAL;		skb->ip_summed = CHECKSUM_PARTIAL;
	skb->csum = 0;		skb->csum = 0;
	sk->sk_sndmsg_off = 0;
	}		}

	err = skb_append_datato_frags(sk,skb, getfrag, from,		err = skb_append_datato_frags(sk,skb, getfrag, from,