Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4f9f6e7 authored by Neal Cardwell's avatar Neal Cardwell Committed by David S. Miller
Browse files

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: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65cff872

include/net/tcp.h

+3 −2
Original line number Diff line number Diff line
@@ -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	*/

};