Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 352e04b9 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

netfilter: nf_ct_tcp, udp: fix compilation with sysctl disabled 



This patch fixes the compilation of the TCP and UDP trackers with sysctl
compilation disabled:

net/netfilter/nf_conntrack_proto_udp.c: In function ‘udp_init_net_data’:
net/netfilter/nf_conntrack_proto_udp.c:279:13: error: ‘struct nf_proto_net’ has no member named
 ‘user’
net/netfilter/nf_conntrack_proto_tcp.c:1606:9: error: ‘struct nf_proto_net’ has no member named
 ‘user’
net/netfilter/nf_conntrack_proto_tcp.c:1643:9: error: ‘struct nf_proto_net’ has no member named
 ‘user’

Reported-by: default avatarFengguang Wu <wfg@linux.intel.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9136461a

net/netfilter/nf_conntrack_proto_tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -1603,7 +1603,7 @@ static int tcpv4_init_net(struct net *net) 
#ifdef CONFIG_SYSCTL

	if (!pn->ctl_table) {

#else

	if (!pn->user++) {

	if (!pn->users++) {

#endif

		for (i = 0; i < TCP_CONNTRACK_TIMEOUT_MAX; i++)

			tn->timeouts[i] = tcp_timeouts[i];
@@ -1640,7 +1640,7 @@ static int tcpv6_init_net(struct net *net) 
#ifdef CONFIG_SYSCTL

	if (!pn->ctl_table) {

#else

	if (!pn->user++) {

	if (!pn->users++) {

#endif

		for (i = 0; i < TCP_CONNTRACK_TIMEOUT_MAX; i++)

			tn->timeouts[i] = tcp_timeouts[i];

net/netfilter/nf_conntrack_proto_udp.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static void udp_init_net_data(struct nf_udp_net *un) 
#ifdef CONFIG_SYSCTL

	if (!un->pn.ctl_table) {

#else

	if (!un->pn.user++) {

	if (!un->pn.users++) {

#endif

		for (i = 0; i < UDP_CT_MAX; i++)

			un->timeouts[i] = udp_timeouts[i];