Skip to content

Commit

Permalink
InfiniR Cepheus v1.29
Browse files Browse the repository at this point in the history
* merge 4.14.350 openela
** fix build after merge
  • Loading branch information
raystef66 committed Aug 16, 2024
1 parent ba3ab16 commit 9e1ce0f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/arm64/configs/cepheus_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION="-InfiniR_cepheus_A14_v1.28"
CONFIG_LOCALVERSION="-InfiniR_cepheus_A14_v1.29"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

KERNEL_DEFCONFIG=cepheus_defconfig
ANYKERNEL3_DIR=$PWD/AnyKernel3/
FINAL_KERNEL_ZIP=InfiniR_cepheus_A14_v1.28.zip
FINAL_KERNEL_ZIP=InfiniR_cepheus_A14_v1.29.zip

# paths
TC="/home/raystef66/kernel/prebuilts"
Expand Down
4 changes: 3 additions & 1 deletion net/ipv4/tcp_output.c
Original file line number Diff line number Diff line change
Expand Up @@ -3109,6 +3109,7 @@ void tcp_send_fin(struct sock *sk)
* as TCP stack thinks it has already been transmitted.
*/
if (tskb && (tcp_send_head(sk) || tcp_under_memory_pressure(sk))) {
coalesce:
TCP_SKB_CB(tskb)->tcp_flags |= TCPHDR_FIN;
TCP_SKB_CB(tskb)->end_seq++;
tp->write_seq++;
Expand All @@ -3130,7 +3131,7 @@ void tcp_send_fin(struct sock *sk)
if (tskb)
goto coalesce;
return;

}
skb_reserve(skb, MAX_TCP_HEADER);
sk_forced_mem_schedule(sk, skb->truesize);
/* FIN eats a sequence byte, write_seq advanced by tcp_queue_skb(). */
Expand All @@ -3141,6 +3142,7 @@ void tcp_send_fin(struct sock *sk)
__tcp_push_pending_frames(sk, tcp_current_mss(sk), TCP_NAGLE_OFF);
}


/* We get here when a process closes a file descriptor (either due to
* an explicit close() or as a byproduct of exit()'ing) and there
* was unread data in the receive queue. This behavior is recommended
Expand Down

0 comments on commit 9e1ce0f

Please sign in to comment.