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>

diff --git a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c
index 4a14d069f8abf05e0d5a9f004da18bbe16d2cd97..b9b334cccf3722a0a043589a8e0ffd7fbf5ab1e5 100644 (file)
--- 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)
 
 
 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;

diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c
index 46b870385b89d51fa853197f5632d1a0c294c701..f1c845036898a37ee8f18e0f494a2886d2e8d1d7 100644 (file)
--- 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)
 
 
 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;