diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-11-17 16:59:12 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:24:03 -0500 |
commit | 352d48008b6f3e02d8ce77868432e329dd921cb1 (patch) | |
tree | f95a23cc93d4a2bc7b7ef2f0431e455ab2059506 /net | |
parent | eafff86d3bd80403c808f67f5389813fdb5bd6c8 (diff) |
[TCP]: Tidy up skb_entail
Heck, it even saves us some few bytes:
[acme@newtoy net-2.6.20]$ codiff -f /tmp/tcp.o.before ../OUTPUT/qemu/net-2.6.20/net/ipv4/tcp.o
/pub/scm/linux/kernel/git/acme/net-2.6.20/net/ipv4/tcp.c:
tcp_sendpage | -7
tcp_sendmsg | -5
2 functions changed, 12 bytes removed
[acme@newtoy net-2.6.20]$
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/tcp.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 168f9de906bc..a6b228914b8e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -463,11 +463,12 @@ static inline int forced_push(struct tcp_sock *tp) | |||
463 | static inline void skb_entail(struct sock *sk, struct tcp_sock *tp, | 463 | static inline void skb_entail(struct sock *sk, struct tcp_sock *tp, |
464 | struct sk_buff *skb) | 464 | struct sk_buff *skb) |
465 | { | 465 | { |
466 | skb->csum = 0; | 466 | struct tcp_skb_cb *tcb = TCP_SKB_CB(skb); |
467 | TCP_SKB_CB(skb)->seq = tp->write_seq; | 467 | |
468 | TCP_SKB_CB(skb)->end_seq = tp->write_seq; | 468 | skb->csum = 0; |
469 | TCP_SKB_CB(skb)->flags = TCPCB_FLAG_ACK; | 469 | tcb->seq = tcb->end_seq = tp->write_seq; |
470 | TCP_SKB_CB(skb)->sacked = 0; | 470 | tcb->flags = TCPCB_FLAG_ACK; |
471 | tcb->sacked = 0; | ||
471 | skb_header_release(skb); | 472 | skb_header_release(skb); |
472 | __skb_queue_tail(&sk->sk_write_queue, skb); | 473 | __skb_queue_tail(&sk->sk_write_queue, skb); |
473 | sk_charge_skb(sk, skb); | 474 | sk_charge_skb(sk, skb); |