aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2008-08-14 19:26:15 -0400
committerSimon Horman <horms@verge.net.au>2008-08-14 19:26:15 -0400
commit4a031b0e6acd8a8c23725ceb5db6a0aa5c4e231f (patch)
tree29f8cdf707127e614e5c90735ac886e3d1148851
parenta919cf4b6b499416b6e2247dbc79196c4325f2e6 (diff)
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: Simon Horman <horms@verge.net.au>
-rw-r--r--net/ipv4/ipvs/ip_vs_lblc.c6
-rw-r--r--net/ipv4/ipvs/ip_vs_lblcr.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c
index 4a14d069f8ab..b9b334cccf37 100644
--- a/net/ipv4/ipvs/ip_vs_lblc.c
+++ b/net/ipv4/ipvs/ip_vs_lblc.c
@@ -389,7 +389,7 @@ static int ip_vs_lblc_done_svc(struct ip_vs_service *svc)
389 389
390 390
391static inline struct ip_vs_dest * 391static inline struct ip_vs_dest *
392__ip_vs_wlc_schedule(struct ip_vs_service *svc, struct iphdr *iph) 392__ip_vs_lblc_schedule(struct ip_vs_service *svc, struct iphdr *iph)
393{ 393{
394 struct ip_vs_dest *dest, *least; 394 struct ip_vs_dest *dest, *least;
395 int loh, doh; 395 int loh, doh;
@@ -488,7 +488,7 @@ ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
488 tbl = (struct ip_vs_lblc_table *)svc->sched_data; 488 tbl = (struct ip_vs_lblc_table *)svc->sched_data;
489 en = ip_vs_lblc_get(tbl, iph->daddr); 489 en = ip_vs_lblc_get(tbl, iph->daddr);
490 if (en == NULL) { 490 if (en == NULL) {
491 dest = __ip_vs_wlc_schedule(svc, iph); 491 dest = __ip_vs_lblc_schedule(svc, iph);
492 if (dest == NULL) { 492 if (dest == NULL) {
493 IP_VS_DBG(1, "no destination available\n"); 493 IP_VS_DBG(1, "no destination available\n");
494 return NULL; 494 return NULL;
@@ -503,7 +503,7 @@ ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
503 if (!(dest->flags & IP_VS_DEST_F_AVAILABLE) 503 if (!(dest->flags & IP_VS_DEST_F_AVAILABLE)
504 || atomic_read(&dest->weight) <= 0 504 || atomic_read(&dest->weight) <= 0
505 || is_overloaded(dest, svc)) { 505 || is_overloaded(dest, svc)) {
506 dest = __ip_vs_wlc_schedule(svc, iph); 506 dest = __ip_vs_lblc_schedule(svc, iph);
507 if (dest == NULL) { 507 if (dest == NULL) {
508 IP_VS_DBG(1, "no destination available\n"); 508 IP_VS_DBG(1, "no destination available\n");
509 return NULL; 509 return NULL;
diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c
index 46b870385b89..f1c845036898 100644
--- a/net/ipv4/ipvs/ip_vs_lblcr.c
+++ b/net/ipv4/ipvs/ip_vs_lblcr.c
@@ -573,7 +573,7 @@ static int ip_vs_lblcr_done_svc(struct ip_vs_service *svc)
573 573
574 574
575static inline struct ip_vs_dest * 575static inline struct ip_vs_dest *
576__ip_vs_wlc_schedule(struct ip_vs_service *svc, struct iphdr *iph) 576__ip_vs_lblcr_schedule(struct ip_vs_service *svc, struct iphdr *iph)
577{ 577{
578 struct ip_vs_dest *dest, *least; 578 struct ip_vs_dest *dest, *least;
579 int loh, doh; 579 int loh, doh;
@@ -673,7 +673,7 @@ ip_vs_lblcr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
673 tbl = (struct ip_vs_lblcr_table *)svc->sched_data; 673 tbl = (struct ip_vs_lblcr_table *)svc->sched_data;
674 en = ip_vs_lblcr_get(tbl, iph->daddr); 674 en = ip_vs_lblcr_get(tbl, iph->daddr);
675 if (en == NULL) { 675 if (en == NULL) {
676 dest = __ip_vs_wlc_schedule(svc, iph); 676 dest = __ip_vs_lblcr_schedule(svc, iph);
677 if (dest == NULL) { 677 if (dest == NULL) {
678 IP_VS_DBG(1, "no destination available\n"); 678 IP_VS_DBG(1, "no destination available\n");
679 return NULL; 679 return NULL;
@@ -687,7 +687,7 @@ ip_vs_lblcr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
687 } else { 687 } else {
688 dest = ip_vs_dest_set_min(&en->set); 688 dest = ip_vs_dest_set_min(&en->set);
689 if (!dest || is_overloaded(dest, svc)) { 689 if (!dest || is_overloaded(dest, svc)) {
690 dest = __ip_vs_wlc_schedule(svc, iph); 690 dest = __ip_vs_lblcr_schedule(svc, iph);
691 if (dest == NULL) { 691 if (dest == NULL) {
692 IP_VS_DBG(1, "no destination available\n"); 692 IP_VS_DBG(1, "no destination available\n");
693 return NULL; 693 return NULL;