update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/net/netfilter/nf_conntrack_standalone.c
..
..
@@ -583,7 +583,6 @@
583
583
 	NF_SYSCTL_CT_PROTO_TIMEOUT_SCTP_SHUTDOWN_RECD,
584
584
 	NF_SYSCTL_CT_PROTO_TIMEOUT_SCTP_SHUTDOWN_ACK_SENT,
585
585
 	NF_SYSCTL_CT_PROTO_TIMEOUT_SCTP_HEARTBEAT_SENT,
586
-	NF_SYSCTL_CT_PROTO_TIMEOUT_SCTP_HEARTBEAT_ACKED,
587
586
 #endif
588
587
 #ifdef CONFIG_NF_CT_PROTO_DCCP
589
588
 	NF_SYSCTL_CT_PROTO_TIMEOUT_DCCP_REQUEST,
..
..
@@ -853,12 +852,6 @@
853
852
 		.mode		= 0644,
854
853
 		.proc_handler	= proc_dointvec_jiffies,
855
854
 	},
856
-	[NF_SYSCTL_CT_PROTO_TIMEOUT_SCTP_HEARTBEAT_ACKED] = {
857
-		.procname       = "nf_conntrack_sctp_timeout_heartbeat_acked",
858
-		.maxlen         = sizeof(unsigned int),
859
-		.mode           = 0644,
860
-		.proc_handler   = proc_dointvec_jiffies,
861
-	},
862
855
 #endif
863
856
 #ifdef CONFIG_NF_CT_PROTO_DCCP
864
857
 	[NF_SYSCTL_CT_PROTO_TIMEOUT_DCCP_REQUEST] = {
..
..
@@ -987,7 +980,6 @@
987
980
 	XASSIGN(SHUTDOWN_RECD, sn);
988
981
 	XASSIGN(SHUTDOWN_ACK_SENT, sn);
989
982
 	XASSIGN(HEARTBEAT_SENT, sn);
990
-	XASSIGN(HEARTBEAT_ACKED, sn);
991
983
 #undef XASSIGN
992
984
 #endif
993
985
 }
..
..
@@ -1178,11 +1170,12 @@
1178
1170
 	nf_conntrack_htable_size_user = nf_conntrack_htable_size;
1179
1171
 #endif
1180
1172
 
1173
+	nf_conntrack_init_end();
1174
+
1181
1175
 	ret = register_pernet_subsys(&nf_conntrack_net_ops);
1182
1176
 	if (ret < 0)
1183
1177
 		goto out_pernet;
1184
1178
 
1185
-	nf_conntrack_init_end();
1186
1179
 	return 0;
1187
1180
 
1188
1181
 out_pernet: