diff options
| author |   Eric Dumazet <eric.dumazet@gmail.com> | 2011-09-27 13:25:05 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-09-27 13:25:05 -0400 |
| commit | 4de075e0438ba54b8f42cbbc1263d404229dc997 (patch) | |
| tree | dc2400d1539cb462e9b441d841577e8bc8f0048d /net/ipv4/tcp_input.c | |
| parent | tcp: unalias tcp_skb_cb flags and ip_dsfield (diff) | |
| download | linux-dev-4de075e0438ba54b8f42cbbc1263d404229dc997.tar.xz linux-dev-4de075e0438ba54b8f42cbbc1263d404229dc997.zip | |
tcp: rename tcp_skb_cb flags
Rename struct tcp_skb_cb "flags" to "tcp_flags" to ease code review and
maintenance.
Its content is a combination of FIN/SYN/RST/PSH/ACK/URG/ECE/CWR flags
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 7008fccc164f..143221ebeb7a 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1449,7 +1449,7 @@ static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb, tp->lost_cnt_hint -= tcp_skb_pcount(prev); } - TCP_SKB_CB(skb)->flags |= TCP_SKB_CB(prev)->flags; + TCP_SKB_CB(skb)->tcp_flags |= TCP_SKB_CB(prev)->tcp_flags; if (skb == tcp_highest_sack(sk)) tcp_advance_highest_sack(sk, skb); @@ -3348,7 +3348,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets, * connection startup slow start one packet too * quickly. This is severely frowned upon behavior. */ - if (!(scb->flags & TCPHDR_SYN)) { + if (!(scb->tcp_flags & TCPHDR_SYN)) { flag |= FLAG_DATA_ACKED; } else { flag |= FLAG_SYN_ACKED; |