Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Aug 2009 19:42:04 GMT
From:      Ana Kukec <anchie@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 167222 for review
Message-ID:  <200908111942.n7BJg4Bf068662@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=167222

Change 167222 by anchie@anchie_desnimis on 2009/08/11 19:41:58

		Minor fix. 	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#7 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#7 (text+ko) ====

@@ -73,13 +73,7 @@
 #include <netinet6/scope6_var.h>
 #include <netinet6/nd6.h>
 #include <netinet/icmp6.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/netinet6/nd6_nbr.c#54
-#include <netinet6/vinet6.h>
-==== THEIRS //depot/vendor/freebsd/src/sys/netinet6/nd6_nbr.c#60
-==== YOURS //anchie_desnimis/gsoc2009-send/src/sys/netinet6/nd6_nbr.c
 #include <netinet6/send.h>
-#include <netinet6/vinet6.h>
-<<<<
 
 #ifdef DEV_CARP
 #include <netinet/ip_carp.h>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908111942.n7BJg4Bf068662>