Skip to content

Commit edc7e48

Browse files
mjmartineaudavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e42f1ac commit edc7e48

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

net/mptcp/protocol.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
static void __mptcp_close(struct sock *sk, long timeout);
2828

29-
static const struct proto_ops * tcp_proto_ops(struct sock *sk)
29+
static const struct proto_ops *tcp_proto_ops(struct sock *sk)
3030
{
3131
#if IS_ENABLED(CONFIG_IPV6)
3232
if (sk->sk_family == AF_INET6)

net/mptcp/subflow.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ void mptcp_handle_ipv6_mapped(struct sock *sk, bool mapped)
592592
target = mapped ? &subflow_v6m_specific : subflow_default_af_ops(sk);
593593

594594
pr_debug("subflow=%p family=%d ops=%p target=%p mapped=%d",
595-
subflow, sk->sk_family, icsk->icsk_af_ops, target, mapped);
595+
subflow, sk->sk_family, icsk->icsk_af_ops, target, mapped);
596596

597597
if (likely(icsk->icsk_af_ops == target))
598598
return;
@@ -773,7 +773,7 @@ static void subflow_ulp_clone(const struct request_sock *req,
773773
}
774774

775775
new_ctx = subflow_create_ctx(newsk, priority);
776-
if (new_ctx == NULL) {
776+
if (!new_ctx) {
777777
subflow_ulp_fallback(newsk, old_ctx);
778778
return;
779779
}

0 commit comments

Comments
 (0)