tcp: fix regression in urgent data handling
authorEric Dumazet <edumazet@google.com>
Mon, 17 Sep 2012 12:51:39 +0000 (12:51 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Sep 2012 20:26:27 +0000 (16:26 -0400)
commit1d57f19539c074105791da6384a8ad674bba8037
treec23d0bb80809e6e01d01e7aa5642597cc8295bbe
parent0e698bf6624c469cd4f3f391247b142963ca9c4e
tcp: fix regression in urgent data handling

Stephan Springl found that commit 1402d366019fed "tcp: introduce
tcp_try_coalesce" introduced a regression for rlogin

It turns out problem comes from TCP urgent data handling and
a change in behavior in input path.

rlogin sends two one-byte packets with URG ptr set, and when next data
frame is coalesced, we lack sk_data_ready() calls to wakeup consumer.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Stephan Springl <springl-k@lar.bfw.de>
Cc: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_input.c