mptcp: use net instead of sock_net

Use the local variable 'net' instead of sock_net() in the functions where
the variable 'struct net *net' has been defined.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 2ea7eae43bdb1a9ee17f4eae3fbceb9656fead67..b5505b8167f9a5a0522779d3286b5bae6dcf9a37 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1143,7 +1143,7 @@ void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ss
                        if (!tcp_rtx_and_write_queues_empty(ssk)) {
                                subflow->stale = 1;
                                __mptcp_retransmit_pending_data(sk);
-                               MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_SUBFLOWSTALE);
+                               MPTCP_INC_STATS(net, MPTCP_MIB_SUBFLOWSTALE);
                        }
                        unlock_sock_fast(ssk, slow);
 
@@ -1903,8 +1903,7 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *info)
        }
 
        if (token)
-               return mptcp_userspace_pm_set_flags(sock_net(skb->sk),
-                                                   token, &addr, &remote, bkup);
+               return mptcp_userspace_pm_set_flags(net, token, &addr, &remote, bkup);
 
        spin_lock_bh(&pernet->lock);
        entry = __lookup_addr(pernet, &addr.addr, lookup_by_id);

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index c533b4647fbeee84aa8ae0a5f36c17abd07c1f2a..62c140f96d77f9ef19ae6392c0fdfa31ff5f88ff 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -2723,8 +2723,8 @@ static int mptcp_init_sock(struct sock *sk)
        mptcp_ca_reset(sk);
 
        sk_sockets_allocated_inc(sk);
-       sk->sk_rcvbuf = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_rmem[1]);
-       sk->sk_sndbuf = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_wmem[1]);
+       sk->sk_rcvbuf = READ_ONCE(net->ipv4.sysctl_tcp_rmem[1]);
+       sk->sk_sndbuf = READ_ONCE(net->ipv4.sysctl_tcp_wmem[1]);
 
        return 0;
 }