IPVS: Remove supports_ipv6 scheduler flag
Subsystems (5)
PATCH 1/1 IPVS: Remove supports_ipv6 scheduler flag
Remove the 'supports_ipv6' scheduler flag since all schedulers now support IPv6.
Signed-off-by Julius Volz <[email protected]>
--- include/net/ip_vs.h | 3 --- net/netfilter/ipvs/ip_vs_ctl.c | 24 ++++++------------------ net/netfilter/ipvs/ip_vs_dh.c | 3 --- net/netfilter/ipvs/ip_vs_lblc.c | 3 --- net/netfilter/ipvs/ip_vs_lblcr.c | 3 --- net/netfilter/ipvs/ip_vs_lc.c | 3 --- net/netfilter/ipvs/ip_vs_nq.c | 3 --- net/netfilter/ipvs/ip_vs_rr.c | 3 --- net/netfilter/ipvs/ip_vs_sed.c | 3 --- net/netfilter/ipvs/ip_vs_sh.c | 3 --- net/netfilter/ipvs/ip_vs_wlc.c | 3 --- net/netfilter/ipvs/ip_vs_wrr.c | 3 --- 12 files changed, 6 insertions(+), 51 deletions(-)
include/net/ip_vs.h +0 -3
@@ -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
@@ -1168,15 +1168,9 @@ 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 )) { - ret = -EINVAL ; - goto out_err; - } +if (u->af ==AF_INET6 && (u->netmask <1 || u->netmask >128 )) { + ret = -EINVAL ; + goto out_err; }#endif
@@ -1272,15 +1266,9 @@ 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 )) { - ret = -EINVAL ; - goto out; - } +if (u->af ==AF_INET6 && (u->netmask <1 || u->netmask >128 )) { + ret = -EINVAL ; + goto out; }#endif
net/netfilter/ipvs/ip_vs_dh.c +0 -3
@@ -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
@@ -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
@@ -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,
net/netfilter/ipvs/ip_vs_lc.c +0 -3
@@ -81,9 +81,6 @@ static struct ip_vs_scheduler ip_vs_lc_scheduler = { .refcnt = ATOMIC_INIT(0), .module = THIS_MODULE, .n_list = LIST_HEAD_INIT(ip_vs_lc_scheduler.n_list), -#ifdef CONFIG_IP_VS_IPV6 - .supports_ipv6 = 1, -#endif .schedule = ip_vs_lc_schedule, };
net/netfilter/ipvs/ip_vs_nq.c +0 -3
@@ -116,9 +116,6 @@ static struct ip_vs_scheduler ip_vs_nq_scheduler = .refcnt = ATOMIC_INIT(0), .module = THIS_MODULE, .n_list = LIST_HEAD_INIT(ip_vs_nq_scheduler.n_list), -#ifdef CONFIG_IP_VS_IPV6 - .supports_ipv6 = 1, -#endif .schedule = ip_vs_nq_schedule, };
net/netfilter/ipvs/ip_vs_rr.c +0 -3
@@ -89,9 +89,6 @@ static struct ip_vs_scheduler ip_vs_rr_scheduler = { .refcnt = ATOMIC_INIT(0), .module = THIS_MODULE, .n_list = LIST_HEAD_INIT(ip_vs_rr_scheduler.n_list), -#ifdef CONFIG_IP_VS_IPV6 - .supports_ipv6 = 1, -#endif .init_service = ip_vs_rr_init_svc, .update_service = ip_vs_rr_update_svc, .schedule = ip_vs_rr_schedule,
net/netfilter/ipvs/ip_vs_sed.c +0 -3
@@ -118,9 +118,6 @@ static struct ip_vs_scheduler ip_vs_sed_scheduler = .refcnt = ATOMIC_INIT(0), .module = THIS_MODULE, .n_list = LIST_HEAD_INIT(ip_vs_sed_scheduler.n_list), -#ifdef CONFIG_IP_VS_IPV6 - .supports_ipv6 = 1, -#endif .schedule = ip_vs_sed_schedule, };
net/netfilter/ipvs/ip_vs_sh.c +0 -3
@@ -240,9 +240,6 @@ static struct ip_vs_scheduler ip_vs_sh_scheduler = .refcnt = ATOMIC_INIT(0), .module = THIS_MODULE, .n_list = LIST_HEAD_INIT(ip_vs_sh_scheduler.n_list), -#ifdef CONFIG_IP_VS_IPV6 - .supports_ipv6 = 1, -#endif .init_service = ip_vs_sh_init_svc, .done_service = ip_vs_sh_done_svc, .update_service = ip_vs_sh_update_svc,
net/netfilter/ipvs/ip_vs_wlc.c +0 -3
@@ -106,9 +106,6 @@ static struct ip_vs_scheduler ip_vs_wlc_scheduler = .refcnt = ATOMIC_INIT(0), .module = THIS_MODULE, .n_list = LIST_HEAD_INIT(ip_vs_wlc_scheduler.n_list), -#ifdef CONFIG_IP_VS_IPV6 - .supports_ipv6 = 1, -#endif .schedule = ip_vs_wlc_schedule, };
net/netfilter/ipvs/ip_vs_wrr.c +0 -3
@@ -213,9 +213,6 @@ static struct ip_vs_scheduler ip_vs_wrr_scheduler = { .refcnt = ATOMIC_INIT(0), .module = THIS_MODULE, .n_list = LIST_HEAD_INIT(ip_vs_wrr_scheduler.n_list), -#ifdef CONFIG_IP_VS_IPV6 - .supports_ipv6 = 1, -#endif .init_service = ip_vs_wrr_init_svc, .done_service = ip_vs_wrr_done_svc, .update_service = ip_vs_wrr_update_svc,
Signature · 1 line
1.5.3.7
David Miller
maintainerFrom: Julius Volz <[email protected]>
Date: Tue, 4 Nov 2008 01:58:26 +0100
Quoted 4 lines
Remove the '
supports_ipv6' scheduler flag since all schedulers now support IPv6.Signed-off-by Julius Volz <[email protected]>
Since Simon explicitly asked for this patch, I've applied it :-)
Simon Horman
maintainerQuoted 10 lines · David Miller
From: Julius Volz <[email protected]>
Date: Tue, 4 Nov 2008 01:58:26 +0100Quoted 4 lines
Remove the '
supports_ipv6' scheduler flag since all schedulers now support IPv6.Signed-off-by Julius Volz <[email protected]>Since Simon explicitly asked for this patch, I've applied it :-)
Thanks :-)
Signature · 3 lines
Simon Horman VA Linux Systems Japan K.K., Sydney, Australia Satellite Office H: www.vergenet.net/~horms/ W: www.valinux.co.jp/en