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

Commit a23f4bbd authored by David S. Miller's avatar David S. Miller
Browse files

Revert "tcp: Always set urgent pointer if it's beyond snd_nxt" 



This reverts commit 64ff3b93.

Jeff Chua reports that it breaks rlogin for him.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0178b695

net/ipv4/tcp_output.c

+4 −8
Original line number Diff line number Diff line
@@ -663,14 +663,10 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, 
	th->urg_ptr		= 0;



	/* The urg_mode check is necessary during a below snd_una win probe */

	if (unlikely(tcp_urg_mode(tp))) {

		if (between(tp->snd_up, tcb->seq + 1, tcb->seq + 0xFFFF)) {

	if (unlikely(tcp_urg_mode(tp) &&

		     between(tp->snd_up, tcb->seq + 1, tcb->seq + 0xFFFF))) {

		th->urg_ptr		= htons(tp->snd_up - tcb->seq);

		th->urg			= 1;

		} else if (after(tcb->seq + 0xFFFF, tp->snd_nxt)) {

			th->urg_ptr = 0xFFFF;

			th->urg = 1;

		}

	}



	tcp_options_write((__be32 *)(th + 1), tp, &opts, &md5_hash_location);