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

Commit 091bb34c authored by Changli Gao's avatar Changli Gao Committed by Simon Horman
Browse files

netfilter: ipvs: fix compiler warnings 



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: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent bced94ed

net/netfilter/ipvs/ip_vs_ctl.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -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);

net/netfilter/ipvs/ip_vs_proto.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -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