diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-04 21:55:11 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-13 13:45:39 +0000 |
| commit | 05eaa5713dbff4ba233fbf2246ac19517eb3eea3 (patch) | |
| tree | 512423087c20457b79e3765ff0c2d88d66514e2e /net | |
| parent | e4484888436fdf56185ea3e24ac597cafc60cb9e (diff) | |
warnings in net/netfilter/ipvs/ip_vs_ctl.c
Without this patch, building ixp4xx_defconfig results in:
/home/arnd/linux-arm/net/netfilter/ipvs/ip_vs_ctl.c: In function 'ip_vs_genl_set_cmd':
/home/arnd/linux-arm/net/netfilter/ipvs/ip_vs_ctl.c:2238:47: warning: 't.udp_timeout' may be used uninitialized in this function [-Wuninitialized]
/home/arnd/linux-arm/net/netfilter/ipvs/ip_vs_ctl.c:3322:28: note: 't.udp_timeout' was declared here
/home/arnd/linux-arm/net/netfilter/ipvs/ip_vs_ctl.c:2238:47: warning: 't.tcp_fin_timeout' may be used uninitialized in this function [-Wuninitialized]
/home/arnd/linux-arm/net/netfilter/ipvs/ip_vs_ctl.c:3322:28: note: 't.tcp_fin_timeout' was declared here
/home/arnd/linux-arm/net/netfilter/ipvs/ip_vs_ctl.c:2238:47: warning: 't.tcp_timeout' may be used uninitialized in this function [-Wuninitialized]
/home/arnd/linux-arm/net/netfilter/ipvs/ip_vs_ctl.c:3322:28: note: 't.tcp_timeout' was declared here
Generated by script, please check manually
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 84444dda194b..2b34e8157d2c 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -2235,12 +2235,11 @@ static int ip_vs_set_timeout(struct net *net, struct ip_vs_timeout_user *u) struct ip_vs_proto_data *pd; #endif - IP_VS_DBG(2, "Setting timeout tcp:%d tcpfin:%d udp:%d\n", +#ifdef CONFIG_IP_VS_PROTO_TCP + IP_VS_DBG(2, "Setting timeout tcp:%d tcpfin:%d\n", u->tcp_timeout, - u->tcp_fin_timeout, - u->udp_timeout); + u->tcp_fin_timeout); -#ifdef CONFIG_IP_VS_PROTO_TCP if (u->tcp_timeout) { pd = ip_vs_proto_data_get(net, IPPROTO_TCP); pd->timeout_table[IP_VS_TCP_S_ESTABLISHED] @@ -2255,6 +2254,9 @@ static int ip_vs_set_timeout(struct net *net, struct ip_vs_timeout_user *u) #endif #ifdef CONFIG_IP_VS_PROTO_UDP + IP_VS_DBG(2, "Setting timeout udp:%d\n", + u->udp_timeout); + if (u->udp_timeout) { pd = ip_vs_proto_data_get(net, IPPROTO_UDP); pd->timeout_table[IP_VS_UDP_S_NORMAL] |