aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/ipvs/ip_vs_wrr.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-01-08 13:15:47 -0800
committerDavid S. Miller <davem@davemloft.net>2010-01-08 13:15:47 -0800
commit31b683b6444c4d207126b07f433e0e66da142264 (patch)
tree928c76934b43ef60ea62c22a340ad09b210a996b /net/netfilter/ipvs/ip_vs_wrr.c
parente1000e: fix and commonize code for setting the receive address registers (diff)
parentnetfilter: ebtables: enforce CAP_NET_ADMIN (diff)
downloadlinux-dev-31b683b6444c4d207126b07f433e0e66da142264.tar.xz
linux-dev-31b683b6444c4d207126b07f433e0e66da142264.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_wrr.c')
-rw-r--r--net/netfilter/ipvs/ip_vs_wrr.c15
1 files changed, 1 insertions, 14 deletions
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 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/net.h>
+#include <linux/gcd.h>
#include <net/ip_vs.h>
@@ -38,20 +39,6 @@ struct ip_vs_wrr_mark {
};
-/*
- * Get the gcd of server weights
- */
-static int gcd(int a, int b)
-{
- int c;
-
- while ((c = a % b)) {
- a = b;
- b = c;
- }
- return b;
-}
-
static int ip_vs_wrr_gcd_weight(struct ip_vs_service *svc)
{
struct ip_vs_dest *dest;