Skip to content

Commit 00797af

Browse files
matttbekuba-moo
authored andcommitted
mptcp: remove unnecessary else statements
The 'else' statements are not needed here, because their previous 'if' block ends with a 'return'. This fixes CheckPatch warnings: WARNING: else is not generally useful after a break or return Reviewed-by: Geliang Tang <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Signed-off-by: Mat Martineau <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 5eae7a8 commit 00797af

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

net/mptcp/subflow.c

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,6 +1119,8 @@ static enum mapping_status get_mapping_status(struct sock *ssk,
11191119
}
11201120

11211121
if (mpext->data_fin == 1) {
1122+
u64 data_fin_seq;
1123+
11221124
if (data_len == 1) {
11231125
bool updated = mptcp_update_rcv_data_fin(msk, mpext->data_seq,
11241126
mpext->dsn64);
@@ -1131,26 +1133,26 @@ static enum mapping_status get_mapping_status(struct sock *ssk,
11311133
*/
11321134
skb_ext_del(skb, SKB_EXT_MPTCP);
11331135
return MAPPING_OK;
1134-
} else {
1135-
if (updated)
1136-
mptcp_schedule_work((struct sock *)msk);
1137-
1138-
return MAPPING_DATA_FIN;
11391136
}
1140-
} else {
1141-
u64 data_fin_seq = mpext->data_seq + data_len - 1;
11421137

1143-
/* If mpext->data_seq is a 32-bit value, data_fin_seq
1144-
* must also be limited to 32 bits.
1145-
*/
1146-
if (!mpext->dsn64)
1147-
data_fin_seq &= GENMASK_ULL(31, 0);
1138+
if (updated)
1139+
mptcp_schedule_work((struct sock *)msk);
11481140

1149-
mptcp_update_rcv_data_fin(msk, data_fin_seq, mpext->dsn64);
1150-
pr_debug("DATA_FIN with mapping seq=%llu dsn64=%d",
1151-
data_fin_seq, mpext->dsn64);
1141+
return MAPPING_DATA_FIN;
11521142
}
11531143

1144+
data_fin_seq = mpext->data_seq + data_len - 1;
1145+
1146+
/* If mpext->data_seq is a 32-bit value, data_fin_seq must also
1147+
* be limited to 32 bits.
1148+
*/
1149+
if (!mpext->dsn64)
1150+
data_fin_seq &= GENMASK_ULL(31, 0);
1151+
1152+
mptcp_update_rcv_data_fin(msk, data_fin_seq, mpext->dsn64);
1153+
pr_debug("DATA_FIN with mapping seq=%llu dsn64=%d",
1154+
data_fin_seq, mpext->dsn64);
1155+
11541156
/* Adjust for DATA_FIN using 1 byte of sequence space */
11551157
data_len--;
11561158
}

0 commit comments

Comments
 (0)