Re: compilation problem

[Brian Tinsley <btinsley@xxxxxxxxxxx>]

diff files attached...

Horms wrote:
> On Thu, Jan 09, 2003 at 07:04:04PM -0600, Brian Tinsley wrote:
> > > I've been trying to compile LVS 1.0.7 on the 2.4.20-aa1 kernel and 
> > > cannot seem to get past this:
> > >
> > > ip_vs_core.c:203:65: macro "schedule" passed 2 arguments, but takes 
> > > just 0
> > > ip_vs_core.c:260:65: macro "schedule" passed 2 arguments, but takes 
> > > just 0
> > > ip_vs_core.c:355:49: macro "schedule" passed 2 arguments, but takes 
> > > just 0
> > > make: *** [ip_vs_core.o] Error 1
> > >
> > > Any suggestions?
> > >
> > >     
> > Despite the underwhelming response to my previous posting, I have 
> > patches to IPVS 1.0.7 that compile  under 2.4.20-aa1. I assume the same 
> > modifications will be necessary for 2.4.21, so if there is any interest, 
> > I will post them to this list.
> >   
>
> Yes, please do.

-- 

-[========================]-
-[      Brian Tinsley     ]-
-[ Chief Systems Engineer ]-
-[        Emageon         ]-
-[========================]-




--- ipvs-1.0.7/ip_vs.h.orig     Fri Jan 10 10:07:48 2003
+++ ipvs-1.0.7/ip_vs.h  Fri Jan 10 00:40:03 2003
@@ -518,7 +518,7 @@
        int (*update_service)(struct ip_vs_service *svc);
 
        /* selecting a server from the given service */
-       struct ip_vs_dest* (*schedule)(struct ip_vs_service *svc,
+       struct ip_vs_dest* (*vs_schedule)(struct ip_vs_service *svc,
                                       struct iphdr *iph);
 };
 

--- ipvs-1.0.7/ip_vs_conn.c.orig        Fri Jan 10 10:11:49 2003
+++ ipvs-1.0.7/ip_vs_conn.c     Thu Jan  9 18:33:55 2003
@@ -934,7 +934,7 @@
        iph->saddr              =       rt->rt_src;
        iph->ttl                =       old_iph->ttl;
        iph->tot_len            =       htons(skb->len);
-       ip_select_ident(iph, &rt->u.dst, NULL);
+       ip_select_ident(iph);
        ip_send_check(iph);
 
        skb->ip_summed = CHECKSUM_NONE;

--- ipvs-1.0.7/ip_vs_core.c.orig        Fri Jan 10 10:10:54 2003
+++ ipvs-1.0.7/ip_vs_core.c     Thu Jan  9 18:33:55 2003
@@ -43,7 +43,6 @@
 #include <linux/netfilter_ipv4.h>
 
 #include "ip_vs.h"
-//#include <net/ip_vs.h>
 
 
 EXPORT_SYMBOL(register_ip_vs_scheduler);
@@ -200,7 +199,7 @@
                         * No template found or the dest of the connection
                         * template is not available.
                         */
-                       dest = svc->scheduler->schedule(svc, iph);
+                       dest = svc->scheduler->vs_schedule(svc, iph);
                        if (dest == NULL) {
                                IP_VS_DBG(1, "P-schedule: no dest found.\n");
                                return NULL;
@@ -257,7 +256,7 @@
                        if (svc->port)
                                return NULL;
 
-                       dest = svc->scheduler->schedule(svc, iph);
+                       dest = svc->scheduler->vs_schedule(svc, iph);
                        if (dest == NULL) {
                                IP_VS_DBG(1, "P-schedule: no dest found.\n");
                                return NULL;
@@ -352,7 +351,7 @@
                return NULL;
        }
 
-       dest = svc->scheduler->schedule(svc, iph);
+       dest = svc->scheduler->vs_schedule(svc, iph);
        if (dest == NULL) {
                IP_VS_DBG(1, "Schedule: no dest found.\n");
                return NULL;

--- ipvs-1.0.7/ip_vs_ctl.c.orig Fri Jan 10 10:12:36 2003
+++ ipvs-1.0.7/ip_vs_ctl.c      Thu Jan  9 18:33:55 2003
@@ -95,7 +95,7 @@
  */
 void update_defense_level(void)
 {
-       int ip_vs_amem = nr_free_pages() + atomic_read(&page_cache_size) +
+       int ip_vs_amem = nr_free_pages() + page_cache_size +
                atomic_read(&buffermem_pages);
        int nomem = (ip_vs_amem < sysctl_ip_vs_amemthresh);