| Message ID | 20200129.104052.577025513894647835.davem@davemloft.net |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | mptcp: Fix build with PROC_FS disabled. | expand |
On 1/29/20 1:40 AM, David Miller wrote: > > net/mptcp/subflow.c: In function ‘mptcp_subflow_create_socket’: > net/mptcp/subflow.c:624:25: error: ‘struct netns_core’ has no member named ‘sock_inuse’ > > Reported-by: Randy Dunlap <rdunlap@infradead.org> > Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Thanks. > --- > > Applied to 'net'. > > net/mptcp/subflow.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c > index 1662e1178949..205dca1c30b7 100644 > --- a/net/mptcp/subflow.c > +++ b/net/mptcp/subflow.c > @@ -621,7 +621,9 @@ int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock) > */ > sf->sk->sk_net_refcnt = 1; > get_net(net); > +#ifdef CONFIG_PROC_FS > this_cpu_add(*net->core.sock_inuse, 1); > +#endif > err = tcp_set_ulp(sf->sk, "mptcp"); > release_sock(sf->sk); > >
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 1662e1178949..205dca1c30b7 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -621,7 +621,9 @@ int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock) */ sf->sk->sk_net_refcnt = 1; get_net(net); +#ifdef CONFIG_PROC_FS this_cpu_add(*net->core.sock_inuse, 1); +#endif err = tcp_set_ulp(sf->sk, "mptcp"); release_sock(sf->sk);
net/mptcp/subflow.c: In function ‘mptcp_subflow_create_socket’: net/mptcp/subflow.c:624:25: error: ‘struct netns_core’ has no member named ‘sock_inuse’ Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: David S. Miller <davem@davemloft.net> --- Applied to 'net'. net/mptcp/subflow.c | 2 ++ 1 file changed, 2 insertions(+)