virtio: de-structify virtio_block status byte

[linux-2.6-omap-h63xx.git] / net / ipv4 / tcp_input.c

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index cdc051bfdb4d474cb2a479919776cac79b3e18ac..0298f80681f2291b33e1b5d1dab83ee47a428010 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2298,7 +2298,7 @@ static inline int tcp_packet_delayed(struct tcp_sock *tp)
 {
        return !tp->retrans_stamp ||
                (tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr &&
-                (__s32)(tp->rx_opt.rcv_tsecr - tp->retrans_stamp) < 0);
+                before(tp->rx_opt.rcv_tsecr, tp->retrans_stamp));
 }
 
 /* Undo procedures. */
@@ -4925,8 +4925,7 @@ step5:
        tcp_data_snd_check(sk);
        tcp_ack_snd_check(sk);
 
-       if (tcp_defer_accept_check(sk))
-               return -1;
+       tcp_defer_accept_check(sk);
        return 0;
 
 csum_error: