leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: ipvs: fix compiler warnings

Browse Source 
Fix compiler warnings when no transport protocol load balancing support
is configured.

[horms@verge.net.au: removed suprious __ip_vs_cleanup() clean-up hunk]
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Changli Gao 2011-01-21 18:02:13 +08:00 committed by Simon Horman
parent bced94ed5e
commit 091bb34c14
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/netfilter/ipvs/ip_vs_ctl.c
View File

@ -2062,7 +2062,9 @@ static const struct file_operations ip_vs_stats_percpu_fops = {
*/ */
static int ip_vs_set_timeout(struct net *net, struct ip_vs_timeout_user *u) static int ip_vs_set_timeout(struct net *net, struct ip_vs_timeout_user *u)
{ {
#if defined(CONFIG_IP_VS_PROTO_TCP) || defined(CONFIG_IP_VS_PROTO_UDP)
struct ip_vs_proto_data *pd; struct ip_vs_proto_data *pd;
#endif
IP_VS_DBG(2, "Setting timeout tcp:%d tcpfin:%d udp:%d\n", IP_VS_DBG(2, "Setting timeout tcp:%d tcpfin:%d udp:%d\n",
u->tcp_timeout, u->tcp_timeout,
@ -2405,7 +2407,9 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
static inline void static inline void
__ip_vs_get_timeouts(struct net *net, struct ip_vs_timeout_user *u) __ip_vs_get_timeouts(struct net *net, struct ip_vs_timeout_user *u)
{ {
#if defined(CONFIG_IP_VS_PROTO_TCP) || defined(CONFIG_IP_VS_PROTO_UDP)
struct ip_vs_proto_data *pd; struct ip_vs_proto_data *pd;
#endif
#ifdef CONFIG_IP_VS_PROTO_TCP #ifdef CONFIG_IP_VS_PROTO_TCP
pd = ip_vs_proto_data_get(net, IPPROTO_TCP); pd = ip_vs_proto_data_get(net, IPPROTO_TCP);

4
net/netfilter/ipvs/ip_vs_proto.c
View File

@ -60,6 +60,9 @@ static int __used __init register_ip_vs_protocol(struct ip_vs_protocol *pp)
return 0; return 0;
} }
#if defined(CONFIG_IP_VS_PROTO_TCP) || defined(CONFIG_IP_VS_PROTO_UDP) || \
defined(CONFIG_IP_VS_PROTO_SCTP) || defined(CONFIG_IP_VS_PROTO_AH) || \
defined(CONFIG_IP_VS_PROTO_ESP)
/* /*
* register an ipvs protocols netns related data * register an ipvs protocols netns related data
*/ */
@ -85,6 +88,7 @@ register_ip_vs_proto_netns(struct net *net, struct ip_vs_protocol *pp)
return 0; return 0;
} }
#endif
/* /*
* unregister an ipvs protocol * unregister an ipvs protocol