diff mbox series

[mptcp-next] Squash to "mptcp: receive checksum for MP_CAPABLE with data"

Message ID 135787a3f77e222df41dc187395cb4f9181191ac.1620355254.git.geliangtang@gmail.com
State Accepted, archived
Commit 020b96ad573072fe22e012633071b27c48cb3989
Delegated to: Matthieu Baerts
Headers show
Series [mptcp-next] Squash to "mptcp: receive checksum for MP_CAPABLE with data" | expand

Commit Message

Geliang Tang May 7, 2021, 2:42 a.m. UTC
Drop useless braces '{}'.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 net/mptcp/options.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Matthieu Baerts May 7, 2021, 3:52 p.m. UTC | #1
Hi Geliang,

On 07/05/2021 04:42, Geliang Tang wrote:
> Drop useless braces '{}'.

Good catch!

(I thought CheckPatch was looking at that)

- 020b96ad5730: "squashed" in "mptcp: receive checksum for MP_CAPABLE
with data"

Builds and tests are now queued:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210507T155221
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210507T155221

Cheers,
Matt
diff mbox series

Patch

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 5424fa6326ff..cce90c16e47d 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -34,11 +34,10 @@  static void mptcp_parse_option(const struct sk_buff *skb,
 	case MPTCPOPT_MP_CAPABLE:
 		/* strict size checking */
 		if (!(TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN)) {
-			if (skb->len > tcp_hdr(skb)->doff << 2) {
+			if (skb->len > tcp_hdr(skb)->doff << 2)
 				expected_opsize = TCPOLEN_MPTCP_MPC_ACK_DATA;
-			} else {
+			else
 				expected_opsize = TCPOLEN_MPTCP_MPC_ACK;
-			}
 		} else {
 			if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_ACK)
 				expected_opsize = TCPOLEN_MPTCP_MPC_SYNACK;