Skip to content

Commit

Permalink
mptcp: Fix code formatting
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
mjmartineau authored and davem330 committed Jan 25, 2020
1 parent e42f1ac commit edc7e48
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion net/mptcp/protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions net/mptcp/subflow.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit edc7e48

Please sign in to comment.