Commit 48148938 authored by Julius Volz's avatar Julius Volz Committed by David S. Miller
Browse files

IPVS: Remove supports_ipv6 scheduler flag 



Remove the 'supports_ipv6' scheduler flag since all schedulers now
support IPv6.

Signed-off-by: default avatarJulius Volz <julius.volz@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 44548375

include/net/ip_vs.h

+0 −3
Original line number Diff line number Diff line
@@ -503,9 +503,6 @@ struct ip_vs_scheduler { 
	char			*name;		/* scheduler name */

	atomic_t		refcnt;		/* reference counter */

	struct module		*module;	/* THIS_MODULE/NULL */

#ifdef CONFIG_IP_VS_IPV6

	int			supports_ipv6;	/* scheduler has IPv6 support */

#endif



	/* scheduler initializing service */

	int (*init_service)(struct ip_vs_service *svc);

net/netfilter/ipvs/ip_vs_ctl.c

+6 −18
Original line number Diff line number Diff line
@@ -1168,16 +1168,10 @@ ip_vs_add_service(struct ip_vs_service_user_kern *u, 
	}



#ifdef CONFIG_IP_VS_IPV6

	if (u->af == AF_INET6) {

		if (!sched->supports_ipv6) {

			ret = -EAFNOSUPPORT;

			goto out_err;

		}

		if ((u->netmask < 1) || (u->netmask > 128)) {

	if (u->af == AF_INET6 && (u->netmask < 1 || u->netmask > 128)) {

		ret = -EINVAL;

		goto out_err;

	}

	}

#endif



	svc = kzalloc(sizeof(struct ip_vs_service), GFP_ATOMIC);
@@ -1272,16 +1266,10 @@ ip_vs_edit_service(struct ip_vs_service *svc, struct ip_vs_service_user_kern *u) 
	old_sched = sched;



#ifdef CONFIG_IP_VS_IPV6

	if (u->af == AF_INET6) {

		if (!sched->supports_ipv6) {

			ret = -EAFNOSUPPORT;

			goto out;

		}

		if ((u->netmask < 1) || (u->netmask > 128)) {

	if (u->af == AF_INET6 && (u->netmask < 1 || u->netmask > 128)) {

		ret = -EINVAL;

		goto out;

	}

	}

#endif



	write_lock_bh(&__ip_vs_svc_lock);

net/netfilter/ipvs/ip_vs_dh.c

+0 −3
Original line number Diff line number Diff line
@@ -243,9 +243,6 @@ static struct ip_vs_scheduler ip_vs_dh_scheduler = 
	.refcnt =		ATOMIC_INIT(0),

	.module =		THIS_MODULE,

	.n_list =		LIST_HEAD_INIT(ip_vs_dh_scheduler.n_list),

#ifdef CONFIG_IP_VS_IPV6

	.supports_ipv6 =	1,

#endif

	.init_service =		ip_vs_dh_init_svc,

	.done_service =		ip_vs_dh_done_svc,

	.update_service =	ip_vs_dh_update_svc,

net/netfilter/ipvs/ip_vs_lblc.c

+0 −3
Original line number Diff line number Diff line
@@ -534,9 +534,6 @@ static struct ip_vs_scheduler ip_vs_lblc_scheduler = 
	.refcnt =		ATOMIC_INIT(0),

	.module =		THIS_MODULE,

	.n_list =		LIST_HEAD_INIT(ip_vs_lblc_scheduler.n_list),

#ifdef CONFIG_IP_VS_IPV6

	.supports_ipv6 =	1,

#endif

	.init_service =		ip_vs_lblc_init_svc,

	.done_service =		ip_vs_lblc_done_svc,

	.schedule =		ip_vs_lblc_schedule,

net/netfilter/ipvs/ip_vs_lblcr.c

+0 −3
Original line number Diff line number Diff line
@@ -735,9 +735,6 @@ static struct ip_vs_scheduler ip_vs_lblcr_scheduler = 
	.refcnt =		ATOMIC_INIT(0),

	.module =		THIS_MODULE,

	.n_list =		LIST_HEAD_INIT(ip_vs_lblcr_scheduler.n_list),

#ifdef CONFIG_IP_VS_IPV6

	.supports_ipv6 =	1,

#endif

	.init_service =		ip_vs_lblcr_init_svc,

	.done_service =		ip_vs_lblcr_done_svc,

	.schedule =		ip_vs_lblcr_schedule,