diff options
| author | Neal Cardwell <ncardwell@google.com> | 2012-04-16 07:08:06 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-16 14:38:16 -0400 |
| commit | f4f9f6e75d67ddfcfea79a2108217bc654aef3af (patch) | |
| tree | 27dfcbaccae81018e4b618031d2c6a8725d463d4 | |
| parent | 65cff8720164611ec617d4cc1ea65f2deb3832b6 (diff) | |
| download | op-kernel-dev-f4f9f6e75d67ddfcfea79a2108217bc654aef3af.zip op-kernel-dev-f4f9f6e75d67ddfcfea79a2108217bc654aef3af.tar.gz | |
tcp: restore formatting of macros for tcp_skb_cb sacked field
Commit b82d1bb4 inadvertendly placed unrelated new code between
TCPCB_EVER_RETRANS and TCPCB_RETRANS and the other macros that refer
to the sacked field in the struct tcp_skb_cb (probably because there
was a misleading empty line there). This commit fixes up the
formatting so that all macros related to the sacked field are adjacent
again.
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/tcp.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 025c31aa..d5984e3 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -645,16 +645,17 @@ struct tcp_skb_cb { __u32 end_seq; /* SEQ + FIN + SYN + datalen */ __u32 when; /* used to compute rtt's */ __u8 tcp_flags; /* TCP header flags. (tcp[13]) */ + __u8 sacked; /* State flags for SACK/FACK. */ #define TCPCB_SACKED_ACKED 0x01 /* SKB ACK'd by a SACK block */ #define TCPCB_SACKED_RETRANS 0x02 /* SKB retransmitted */ #define TCPCB_LOST 0x04 /* SKB is lost */ #define TCPCB_TAGBITS 0x07 /* All tag bits */ - __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */ - /* 1 byte hole */ #define TCPCB_EVER_RETRANS 0x80 /* Ever retransmitted frame */ #define TCPCB_RETRANS (TCPCB_SACKED_RETRANS|TCPCB_EVER_RETRANS) + __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */ + /* 1 byte hole */ __u32 ack_seq; /* Sequence number ACK'd */ }; |
