summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMat Martineau <mathew.j.martineau@linux.intel.com>2020-01-24 16:04:03 -0800
committerDavid S. Miller <davem@davemloft.net>2020-01-25 08:14:39 +0100
commitedc7e4898d5fdb164de1ab9d3a0c30ef9888e4f1 (patch)
treeaadcf5a2ff6f93e7f3fe90d6ef8194490e0cf5fd
parente42f1ac626e7f799717d006e0f8393b6d6f9fc8c (diff)
mptcp: Fix code formatting
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/mptcp/protocol.c2
-rw-r--r--net/mptcp/subflow.c4
2 files changed, 3 insertions, 3 deletions
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;
}