diff options
author | Florian Fainelli <florian@openwrt.org> | 2009-12-22 03:42:06 -0500 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2009-12-22 03:42:06 -0500 |
commit | ae24e578de02b87cce3dc59248c29b2ecb071e9e (patch) | |
tree | aa8bca747bb40bd0763f0fcac20ad0b2ce0f567b | |
parent | 258c889362aa95d0ab534b38ce8c15d3009705b1 (diff) |
ipvs: ip_vs_wrr.c: use lib/gcd.c
Remove the private version of the greatest common divider to use
lib/gcd.c, the latter also implementing the a < b case.
[akpm@linux-foundation.org: repair neighboring whitespace because the diff looked odd]
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Takashi Iwai <tiwai@suse.de>
Acked-by: Simon Horman <horms@verge.net.au>
Cc: Julius Volz <juliusv@google.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r-- | net/netfilter/ipvs/Kconfig | 3 | ||||
-rw-r--r-- | net/netfilter/ipvs/ip_vs_wrr.c | 15 |
2 files changed, 3 insertions, 15 deletions
diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig index 79a698052218..f2d76238b9b5 100644 --- a/net/netfilter/ipvs/Kconfig +++ b/net/netfilter/ipvs/Kconfig | |||
@@ -112,7 +112,8 @@ config IP_VS_RR | |||
112 | module, choose M here. If unsure, say N. | 112 | module, choose M here. If unsure, say N. |
113 | 113 | ||
114 | config IP_VS_WRR | 114 | config IP_VS_WRR |
115 | tristate "weighted round-robin scheduling" | 115 | tristate "weighted round-robin scheduling" |
116 | select GCD | ||
116 | ---help--- | 117 | ---help--- |
117 | The weighted robin-robin scheduling algorithm directs network | 118 | The weighted robin-robin scheduling algorithm directs network |
118 | connections to different real servers based on server weights | 119 | connections to different real servers based on server weights |
diff --git a/net/netfilter/ipvs/ip_vs_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c index 6182e8ea0be7..3c115fc19784 100644 --- a/net/netfilter/ipvs/ip_vs_wrr.c +++ b/net/netfilter/ipvs/ip_vs_wrr.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
26 | #include <linux/net.h> | 26 | #include <linux/net.h> |
27 | #include <linux/gcd.h> | ||
27 | 28 | ||
28 | #include <net/ip_vs.h> | 29 | #include <net/ip_vs.h> |
29 | 30 | ||
@@ -38,20 +39,6 @@ struct ip_vs_wrr_mark { | |||
38 | }; | 39 | }; |
39 | 40 | ||
40 | 41 | ||
41 | /* | ||
42 | * Get the gcd of server weights | ||
43 | */ | ||
44 | static int gcd(int a, int b) | ||
45 | { | ||
46 | int c; | ||
47 | |||
48 | while ((c = a % b)) { | ||
49 | a = b; | ||
50 | b = c; | ||
51 | } | ||
52 | return b; | ||
53 | } | ||
54 | |||
55 | static int ip_vs_wrr_gcd_weight(struct ip_vs_service *svc) | 42 | static int ip_vs_wrr_gcd_weight(struct ip_vs_service *svc) |
56 | { | 43 | { |
57 | struct ip_vs_dest *dest; | 44 | struct ip_vs_dest *dest; |