net: Simplify conntrack_proto_gre pernet operations.

[~andy/linux] / net / ipv4 / tcp_lp.c

diff --git a/net/ipv4/tcp_lp.c b/net/ipv4/tcp_lp.c
index ce3c41ff50b2736d5c41b1436cdcd189dcb11c00..de870377fbba9b5d1f38827fc65197424968ca37 100644 (file)
--- a/net/ipv4/tcp_lp.c
+++ b/net/ipv4/tcp_lp.c
@@ -143,8 +143,8 @@ static u32 tcp_lp_remote_hz_estimator(struct sock *sk)
                goto out;
 
        /* we can't calc remote HZ with no different!! */
-       if (tp->rx_opt.rcv_tsval == lp->remote_ref_time
-           || tp->rx_opt.rcv_tsecr == lp->local_ref_time)
+       if (tp->rx_opt.rcv_tsval == lp->remote_ref_time ||
+           tp->rx_opt.rcv_tsecr == lp->local_ref_time)
                goto out;
 
        m = HZ * (tp->rx_opt.rcv_tsval -