| Message ID | 20200125000403.251894-3-mathew.j.martineau@linux.intel.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | MPTCP: Fixups for part 2 | expand |
From: Mat Martineau <mathew.j.martineau@linux.intel.com> Date: Fri, 24 Jan 2020 16:04:03 -0800 > checkpatch.pl had a few complaints in the last set of MPTCP patches: > > ERROR: code indent should use tabs where possible > +^I subflow, sk->sk_family, icsk->icsk_af_ops, target, mapped);$ > > CHECK: Comparison to NULL could be written "!new_ctx" > + if (new_ctx == NULL) { > > ERROR: "foo * bar" should be "foo *bar" > +static const struct proto_ops * tcp_proto_ops(struct sock *sk) > > Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Applied.
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 41d49126d29a..39fdca79ce90 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -26,7 +26,7 @@ static void __mptcp_close(struct sock *sk, long timeout); -static const struct proto_ops * tcp_proto_ops(struct sock *sk) +static const struct proto_ops *tcp_proto_ops(struct sock *sk) { #if IS_ENABLED(CONFIG_IPV6) if (sk->sk_family == AF_INET6) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 8cfa1d29d59c..1662e1178949 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -592,7 +592,7 @@ void mptcp_handle_ipv6_mapped(struct sock *sk, bool mapped) target = mapped ? &subflow_v6m_specific : subflow_default_af_ops(sk); pr_debug("subflow=%p family=%d ops=%p target=%p mapped=%d", - subflow, sk->sk_family, icsk->icsk_af_ops, target, mapped); + subflow, sk->sk_family, icsk->icsk_af_ops, target, mapped); if (likely(icsk->icsk_af_ops == target)) return; @@ -773,7 +773,7 @@ static void subflow_ulp_clone(const struct request_sock *req, } new_ctx = subflow_create_ctx(newsk, priority); - if (new_ctx == NULL) { + if (!new_ctx) { subflow_ulp_fallback(newsk, old_ctx); return; }
checkpatch.pl had a few complaints in the last set of MPTCP patches: ERROR: code indent should use tabs where possible +^I subflow, sk->sk_family, icsk->icsk_af_ops, target, mapped);$ CHECK: Comparison to NULL could be written "!new_ctx" + if (new_ctx == NULL) { ERROR: "foo * bar" should be "foo *bar" +static const struct proto_ops * tcp_proto_ops(struct sock *sk) Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> --- net/mptcp/protocol.c | 2 +- net/mptcp/subflow.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)