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

Commit 67b95bd7 authored by Vijay Subramanian's avatar Vijay Subramanian Committed by David S. Miller
Browse files

tcp: Return bool instead of int where appropriate 



Applied to a set of static inline functions in tcp_input.c

Signed-off-by: default avatarVijay Subramanian <subramanian.vijay@gmail.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 36e90319

net/ipv4/tcp_input.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -2521,7 +2521,7 @@ static void tcp_cwnd_down(struct sock *sk, int flag) 
/* Nothing was retransmitted or returned timestamp is less

/* Nothing was retransmitted or returned timestamp is less

 * than timestamp of the first retransmission.

 * than timestamp of the first retransmission.

 */

 */

static inline int tcp_packet_delayed(const struct tcp_sock *tp)

static inline bool tcp_packet_delayed(const struct tcp_sock *tp)

{

{

	return !tp->retrans_stamp ||

	return !tp->retrans_stamp ||

		(tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr &&

		(tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr &&
@@ -2582,7 +2582,7 @@ static void tcp_undo_cwr(struct sock *sk, const bool undo_ssthresh) 
	tp->snd_cwnd_stamp = tcp_time_stamp;

	tp->snd_cwnd_stamp = tcp_time_stamp;

}

}





static inline int tcp_may_undo(const struct tcp_sock *tp)

static inline bool tcp_may_undo(const struct tcp_sock *tp)

{

{

	return tp->undo_marker && (!tp->undo_retrans || tcp_packet_delayed(tp));

	return tp->undo_marker && (!tp->undo_retrans || tcp_packet_delayed(tp));

}

}
@@ -3371,13 +3371,13 @@ static void tcp_ack_probe(struct sock *sk) 
	}

	}

}

}





static inline int tcp_ack_is_dubious(const struct sock *sk, const int flag)

static inline bool tcp_ack_is_dubious(const struct sock *sk, const int flag)

{

{

	return !(flag & FLAG_NOT_DUP) || (flag & FLAG_CA_ALERT) ||

	return !(flag & FLAG_NOT_DUP) || (flag & FLAG_CA_ALERT) ||

		inet_csk(sk)->icsk_ca_state != TCP_CA_Open;

		inet_csk(sk)->icsk_ca_state != TCP_CA_Open;

}

}





static inline int tcp_may_raise_cwnd(const struct sock *sk, const int flag)

static inline bool tcp_may_raise_cwnd(const struct sock *sk, const int flag)

{

{

	const struct tcp_sock *tp = tcp_sk(sk);

	const struct tcp_sock *tp = tcp_sk(sk);

	return (!(flag & FLAG_ECE) || tp->snd_cwnd < tp->snd_ssthresh) &&

	return (!(flag & FLAG_ECE) || tp->snd_cwnd < tp->snd_ssthresh) &&
@@ -3387,7 +3387,7 @@ static inline int tcp_may_raise_cwnd(const struct sock *sk, const int flag) 
/* Check that window update is acceptable.

/* Check that window update is acceptable.

 * The function assumes that snd_una<=ack<=snd_next.

 * The function assumes that snd_una<=ack<=snd_next.

 */

 */

static inline int tcp_may_update_window(const struct tcp_sock *tp,

static inline bool tcp_may_update_window(const struct tcp_sock *tp,

					const u32 ack, const u32 ack_seq,

					const u32 ack, const u32 ack_seq,

					const u32 nwin)

					const u32 nwin)

{

{
@@ -4006,7 +4006,7 @@ static int tcp_disordered_ack(const struct sock *sk, const struct sk_buff *skb) 
		(s32)(tp->rx_opt.ts_recent - tp->rx_opt.rcv_tsval) <= (inet_csk(sk)->icsk_rto * 1024) / HZ);

		(s32)(tp->rx_opt.ts_recent - tp->rx_opt.rcv_tsval) <= (inet_csk(sk)->icsk_rto * 1024) / HZ);

}

}





static inline int tcp_paws_discard(const struct sock *sk,

static inline bool tcp_paws_discard(const struct sock *sk,

				   const struct sk_buff *skb)

				   const struct sk_buff *skb)

{

{

	const struct tcp_sock *tp = tcp_sk(sk);

	const struct tcp_sock *tp = tcp_sk(sk);
@@ -4028,7 +4028,7 @@ static inline int tcp_paws_discard(const struct sock *sk, 
 * (borrowed from freebsd)

 * (borrowed from freebsd)

 */

 */





static inline int tcp_sequence(const struct tcp_sock *tp, u32 seq, u32 end_seq)

static inline bool tcp_sequence(const struct tcp_sock *tp, u32 seq, u32 end_seq)

{

{

	return	!before(end_seq, tp->rcv_wup) &&

	return	!before(end_seq, tp->rcv_wup) &&

		!after(seq, tp->rcv_nxt + tcp_receive_window(tp));

		!after(seq, tp->rcv_nxt + tcp_receive_window(tp));
@@ -5214,7 +5214,7 @@ static __sum16 __tcp_checksum_complete_user(struct sock *sk, 
	return result;

	return result;

}

}





static inline int tcp_checksum_complete_user(struct sock *sk,

static inline bool tcp_checksum_complete_user(struct sock *sk,

					     struct sk_buff *skb)

					     struct sk_buff *skb)

{

{

	return !skb_csum_unnecessary(skb) &&

	return !skb_csum_unnecessary(skb) &&