On 10/14/11 17:16, Stefan Sperling wrote:
> CVSROOT:      /cvs Module name:       src Changes by: [email protected] 
> 2011/10/14 10:16:43
> 
> Modified files: sys/netinet6   : nd6_nbr.c
> 
> Log message: Prevent carp slaves from sending IPv6 neighbour 
> advertisements for carp addresses. Fixes "duplicate IP6 address" 
> warnings, appearing since we started accepting IPv6 neighbour 
> discovery packets on carp interfaces. ok henning
> 
> 

RAMDISK / RAMDISK_CD configs NCARP is 0.
I get a warning proxydl unused as only use in function is here..

#if NCARP > 0
        /* Do not send NAs for carp addresses if we're not the CARP master. */
        if (ifp->if_type == IFT_CARP && !carp_iamatch6(ifp, mac, &proxydl))
                goto bad;
#endif

I made the change below, which allows ramdisk to be built.

Nigel

Index: nd6_nbr.c
===================================================================
RCS file: /home/cvs/src/sys/netinet6/nd6_nbr.c,v
retrieving revision 1.58
diff -u -p -r1.58 nd6_nbr.c
--- nd6_nbr.c   14 Oct 2011 16:16:43 -0000      1.58
+++ nd6_nbr.c   14 Oct 2011 21:50:40 -0000
@@ -869,7 +869,9 @@ nd6_na_output(struct ifnet *ifp, struct
        int icmp6len, maxlen, error;
        caddr_t mac;
        struct route_in6 ro;
+#if NCARP > 0
        struct sockaddr_dl *proxydl = NULL;
+#endif

        mac = NULL;
        bzero(&ro, sizeof(ro));

Reply via email to