Skip to content

Commit 5a2ef92

Browse files
herbertxdavem330
authored andcommitted
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 <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 9836f40 commit 5a2ef92

File tree

3 files changed

+0
-5
lines changed

3 files changed

+0
-5
lines changed

net/core/skbuff.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2434,8 +2434,6 @@ int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,
24342434
return -ENOMEM;
24352435

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

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

net/ipv4/ip_output.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,6 @@ static inline int ip_ufo_append_data(struct sock *sk,
767767

768768
skb->ip_summed = CHECKSUM_PARTIAL;
769769
skb->csum = 0;
770-
sk->sk_sndmsg_off = 0;
771770

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

net/ipv6/ip6_output.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,6 @@ static inline int ip6_ufo_append_data(struct sock *sk,
10611061

10621062
skb->ip_summed = CHECKSUM_PARTIAL;
10631063
skb->csum = 0;
1064-
sk->sk_sndmsg_off = 0;
10651064
}
10661065

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

0 commit comments

Comments
 (0)