diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2009-02-28 05:44:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-02 12:00:13 +0100 |
| commit | e6c7d0857905f1d642cb8dbadae6794bfa1dff30 (patch) | |
| tree | 7afb228de02ad9d105b2f1cc4054cbf7b04fa473 /net/ipv4/tcp_output.c | |
| parent | tcp: cleanup ca_state mess in tcp_timer (diff) | |
| download | linux-e6c7d0857905f1d642cb8dbadae6794bfa1dff30.tar.xz linux-e6c7d0857905f1d642cb8dbadae6794bfa1dff30.zip | |
tcp: drop unnecessary local var in collapse
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 77af7faf38a9..61445b57610c 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1767,11 +1767,9 @@ static void tcp_collapse_retrans(struct sock *sk, struct sk_buff *skb) struct tcp_sock *tp = tcp_sk(sk); struct sk_buff *next_skb = tcp_write_queue_next(sk, skb); int skb_size, next_skb_size; - u16 flags; skb_size = skb->len; next_skb_size = next_skb->len; - flags = TCP_SKB_CB(skb)->flags; BUG_ON(tcp_skb_pcount(skb) != 1 || tcp_skb_pcount(next_skb) != 1); @@ -1791,9 +1789,8 @@ static void tcp_collapse_retrans(struct sock *sk, struct sk_buff *skb) /* Update sequence range on original skb. */ TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(next_skb)->end_seq; - /* Merge over control information. */ - flags |= TCP_SKB_CB(next_skb)->flags; /* This moves PSH/FIN etc. over */ - TCP_SKB_CB(skb)->flags = flags; + /* Merge over control information. This moves PSH/FIN etc. over */ + TCP_SKB_CB(skb)->flags |= TCP_SKB_CB(next_skb)->flags; /* All done, get rid of second SKB and account for it so * packet counting does not break. |