Commit 4a031b0e authored by Simon Horman's avatar Simon Horman
Browse files

ipvs: rename __ip_vs_wlc_schedule in lblc and lblcr schedulers 



For the sake of clarity, rename __ip_vs_wlc_schedule() in lblc.c to
__ip_vs_lblc_schedule() and the version in lblcr.c to __ip_vs_lblc_schedule().

I guess the original name stuck from a copy and paste.

Cc: Sven Wegener <sven.wegener@stealer.net>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent a919cf4b

net/ipv4/ipvs/ip_vs_lblc.c

+3 −3
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static int ip_vs_lblc_done_svc(struct ip_vs_service *svc) 




static inline struct ip_vs_dest *

__ip_vs_wlc_schedule(struct ip_vs_service *svc, struct iphdr *iph)

__ip_vs_lblc_schedule(struct ip_vs_service *svc, struct iphdr *iph)

{

	struct ip_vs_dest *dest, *least;

	int loh, doh;
@@ -488,7 +488,7 @@ ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
	tbl = (struct ip_vs_lblc_table *)svc->sched_data;

	en = ip_vs_lblc_get(tbl, iph->daddr);

	if (en == NULL) {

		dest = __ip_vs_wlc_schedule(svc, iph);

		dest = __ip_vs_lblc_schedule(svc, iph);

		if (dest == NULL) {

			IP_VS_DBG(1, "no destination available\n");

			return NULL;
@@ -503,7 +503,7 @@ ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
		if (!(dest->flags & IP_VS_DEST_F_AVAILABLE)

		    || atomic_read(&dest->weight) <= 0

		    || is_overloaded(dest, svc)) {

			dest = __ip_vs_wlc_schedule(svc, iph);

			dest = __ip_vs_lblc_schedule(svc, iph);

			if (dest == NULL) {

				IP_VS_DBG(1, "no destination available\n");

				return NULL;

net/ipv4/ipvs/ip_vs_lblcr.c

+3 −3
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ static int ip_vs_lblcr_done_svc(struct ip_vs_service *svc) 




static inline struct ip_vs_dest *

__ip_vs_wlc_schedule(struct ip_vs_service *svc, struct iphdr *iph)

__ip_vs_lblcr_schedule(struct ip_vs_service *svc, struct iphdr *iph)

{

	struct ip_vs_dest *dest, *least;

	int loh, doh;
@@ -673,7 +673,7 @@ ip_vs_lblcr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
	tbl = (struct ip_vs_lblcr_table *)svc->sched_data;

	en = ip_vs_lblcr_get(tbl, iph->daddr);

	if (en == NULL) {

		dest = __ip_vs_wlc_schedule(svc, iph);

		dest = __ip_vs_lblcr_schedule(svc, iph);

		if (dest == NULL) {

			IP_VS_DBG(1, "no destination available\n");

			return NULL;
@@ -687,7 +687,7 @@ ip_vs_lblcr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
	} else {

		dest = ip_vs_dest_set_min(&en->set);

		if (!dest || is_overloaded(dest, svc)) {

			dest = __ip_vs_wlc_schedule(svc, iph);

			dest = __ip_vs_lblcr_schedule(svc, iph);

			if (dest == NULL) {

				IP_VS_DBG(1, "no destination available\n");

				return NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE