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: Fengguang Wu <wfg@linux.intel.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
9136461ab9
Коммит
352e04b911
|
@ -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];
|
||||
|
|
|
@ -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];
|
||||
|
|
Загрузка…
Ссылка в новой задаче