Unverified Commit 370d9c06 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4146 tcp: fix compilation issue when CONFIG_SYSCTL is disabled 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NB6TAJPSOOCMAJIFS5OQ7VJCSDTSFVO6/ 
 
https://gitee.com/openeuler/kernel/issues/I8Y7PX 
 
Link:https://gitee.com/openeuler/kernel/pulls/4146

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents bf9239af f07a514b

net/ipv4/inet_hashtables.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <net/tcp.h>

#include <net/sock_reuseport.h>



int sysctl_local_port_allocation = 0;



u32 inet_ehashfn(const struct net *net, const __be32 laddr,

		 const __u16 lport, const __be32 faddr,

		 const __be16 fport)

net/ipv4/sysctl_net_ipv4.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ static unsigned long ip_ping_group_range_min[] = { 0, 0 }; 
static unsigned long ip_ping_group_range_max[] = { GID_T_MAX, GID_T_MAX };

static u32 u32_max_div_HZ = UINT_MAX / HZ;

static int one_day_secs = 24 * 3600;

int sysctl_local_port_allocation;

static u32 fib_multipath_hash_fields_all_mask __maybe_unused =

	FIB_MULTIPATH_HASH_FIELD_ALL_MASK;

static unsigned int tcp_child_ehash_entries_max = 16 * 1024 * 1024;