PERFORCE change 178441 for review

Ana Kukec anchie at FreeBSD.org
Tue May 18 12:40:00 UTC 2010


http://p4web.freebsd.org/@@178441?ac=10

Change 178441 by anchie at anchie_malimis on 2010/05/18 12:39:09

	Resolving conflicts occured while doing IFC.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_var.h#10 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#32 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_var.h#10 (text+ko) ====

@@ -199,12 +199,7 @@
 #endif
 #define	V_ip_rsvpd		VNET(ip_rsvpd)
 #define	V_ip_mrouter		VNET(ip_mrouter)
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/netinet/ip_var.h#62
 
-extern u_char	ip_protox[];
-extern int	(*legal_vif_num)(int);
-extern u_long	(*ip_mcast_src)(int);
-extern struct	pr_usrreqs rip_usrreqs;
 #define	V_rsvp_on		VNET(rsvp_on)
 #define	V_send_so		VNET(send_so)
 

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

@@ -1773,7 +1773,7 @@
 	int error = -1;
 	int flags = 0;
 	int ip6len;
-	int  skip;
+	int  skip = 0;
 	unsigned short *nd_type;
 
 	ip6 = mtod(m, struct ip6_hdr *);


More information about the p4-projects mailing list