diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2011-02-28 21:36:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-01 15:35:02 -0500 |
commit | 5a2ef92023506d4e9cd13617b5a46b4d0f1b6747 (patch) | |
tree | 995af8882f53c67ed79e10a1bd37d523ba7986a9 | |
parent | 9836f4080fd5b680cc2d9656355c1a7c681b1ffd (diff) |
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>
-rw-r--r-- | net/core/skbuff.c | 3 | ||||
-rw-r--r-- | net/ipv4/ip_output.c | 1 | ||||
-rw-r--r-- | net/ipv6/ip6_output.c | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 14cf560b4a3e..1eb526a848ff 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -2434,8 +2434,6 @@ int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, | |||
2434 | return -ENOMEM; | 2434 | return -ENOMEM; |
2435 | 2435 | ||
2436 | /* initialize the next frag */ | 2436 | /* initialize the next frag */ |
2437 | sk->sk_sndmsg_page = page; | ||
2438 | sk->sk_sndmsg_off = 0; | ||
2439 | skb_fill_page_desc(skb, frg_cnt, page, 0, 0); | 2437 | skb_fill_page_desc(skb, frg_cnt, page, 0, 0); |
2440 | skb->truesize += PAGE_SIZE; | 2438 | skb->truesize += PAGE_SIZE; |
2441 | atomic_add(PAGE_SIZE, &sk->sk_wmem_alloc); | 2439 | atomic_add(PAGE_SIZE, &sk->sk_wmem_alloc); |
@@ -2455,7 +2453,6 @@ int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, | |||
2455 | return -EFAULT; | 2453 | return -EFAULT; |
2456 | 2454 | ||
2457 | /* copy was successful so update the size parameters */ | 2455 | /* copy was successful so update the size parameters */ |
2458 | sk->sk_sndmsg_off += copy; | ||
2459 | frag->size += copy; | 2456 | frag->size += copy; |
2460 | skb->len += copy; | 2457 | skb->len += copy; |
2461 | skb->data_len += copy; | 2458 | skb->data_len += copy; |
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 04c7b3ba6b39..d3a4540cd308 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c | |||
@@ -767,7 +767,6 @@ static inline int ip_ufo_append_data(struct sock *sk, | |||
767 | 767 | ||
768 | skb->ip_summed = CHECKSUM_PARTIAL; | 768 | skb->ip_summed = CHECKSUM_PARTIAL; |
769 | skb->csum = 0; | 769 | skb->csum = 0; |
770 | sk->sk_sndmsg_off = 0; | ||
771 | 770 | ||
772 | /* specify the length of each IP datagram fragment */ | 771 | /* specify the length of each IP datagram fragment */ |
773 | skb_shinfo(skb)->gso_size = mtu - fragheaderlen; | 772 | skb_shinfo(skb)->gso_size = mtu - fragheaderlen; |
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 065b3f7614fb..5c618f20523e 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -1061,7 +1061,6 @@ static inline int ip6_ufo_append_data(struct sock *sk, | |||
1061 | 1061 | ||
1062 | skb->ip_summed = CHECKSUM_PARTIAL; | 1062 | skb->ip_summed = CHECKSUM_PARTIAL; |
1063 | skb->csum = 0; | 1063 | skb->csum = 0; |
1064 | sk->sk_sndmsg_off = 0; | ||
1065 | } | 1064 | } |
1066 | 1065 | ||
1067 | err = skb_append_datato_frags(sk,skb, getfrag, from, | 1066 | err = skb_append_datato_frags(sk,skb, getfrag, from, |