From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Subject: [patch 2/3] ipvs: supply a valid 0 address to ip_vs_conn_new() Date: Tue, 16 Sep 2008 17:13:20 +1000 Message-ID: <20080916071610.570391582@vergenet.net> References: <20080916071318.939200044@vergenet.net> Cc: Julius Volz , Vince Busam , Wensong Zhang , Julian Anastasov , Sven Wegener To: lvs-devel@vger.kernel.org, netdev@vger.kernel.org Return-path: Content-Disposition: inline; filename=null-daddr.patch Sender: lvs-devel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org ip_vs_conn_new expects a union nf_inet_addr as the type for its address parameters, not a plain integer. This problem was detected by sparse. make C=1 CHECK net/ipv4/ipvs/ip_vs_core.c net/ipv4/ipvs/ip_vs_core.c:469:9: warning: Using plain integer as NULL pointer Signed-off-by: Simon Horman Index: lvs-2.6/net/ipv4/ipvs/ip_vs_core.c =================================================================== --- lvs-2.6.orig/net/ipv4/ipvs/ip_vs_core.c 2008-09-16 15:28:40.000000000 +1000 +++ lvs-2.6/net/ipv4/ipvs/ip_vs_core.c 2008-09-16 15:28:47.000000000 +1000 @@ -457,6 +457,7 @@ int ip_vs_leave(struct ip_vs_service *sv if (sysctl_ip_vs_cache_bypass && svc->fwmark && unicast) { int ret, cs; struct ip_vs_conn *cp; + union nf_inet_addr daddr = { .all = { 0, 0, 0, 0 } }; ip_vs_service_put(svc); @@ -465,7 +466,7 @@ int ip_vs_leave(struct ip_vs_service *sv cp = ip_vs_conn_new(svc->af, iph.protocol, &iph.saddr, pptr[0], &iph.daddr, pptr[1], - 0, 0, + &daddr, 0, IP_VS_CONN_F_BYPASS, NULL); if (cp == NULL) -- -- Simon Horman VA Linux Systems Japan K.K., Sydney, Australia Satellite Office H: www.vergenet.net/~horms/ W: www.valinux.co.jp/en