Skip to content

Commit 9996edf

Browse files
committed
tgupdate: merge t/selftests-bpf-Add-bpf_rr-scheduler into t/selftests-bpf-Add-bpf_red-scheduler base
2 parents 1c9c455 + 6e29f50 commit 9996edf

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

net/mptcp/options.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,9 @@ static bool add_addr_hmac_valid(struct mptcp_sock *msk,
11181118
return hmac == mp_opt->ahmac;
11191119
}
11201120

1121-
/* Return false if a subflow has been reset, else return true */
1121+
/* Return false in case of error (or subflow has been reset),
1122+
* else return true.
1123+
*/
11221124
bool mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)
11231125
{
11241126
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
@@ -1222,7 +1224,7 @@ bool mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)
12221224

12231225
mpext = skb_ext_add(skb, SKB_EXT_MPTCP);
12241226
if (!mpext)
1225-
return true;
1227+
return false;
12261228

12271229
memset(mpext, 0, sizeof(*mpext));
12281230

0 commit comments

Comments
 (0)