PERFORCE change 167223 for review

[Ana Kukec]

http://perforce.freebsd.org/chv.cgi?CH=167223

Change 167223 by anchie at anchie_desnimis on 2009/08/11 21:04:20

	Removing collisions after integrate.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#10 edit

Differences ...

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

@@ -1,10 +1,4 @@
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/netinet/icmp6.h#20
 /*	$FreeBSD: src/sys/netinet/icmp6.h,v 1.24 2009/04/29 10:20:17 bms Exp $	*/
-==== THEIRS //depot/vendor/freebsd/src/sys/netinet/icmp6.h#23
-/*	$FreeBSD: src/sys/netinet/icmp6.h,v 1.27 2009/08/02 19:43:32 rwatson Exp $	*/
-==== YOURS //anchie_desnimis/gsoc2009-send/src/sys/netinet/icmp6.h
-/*	$FreeBSD: src/sys/netinet/icmp6.h,v 1.21.8.1 2009/04/15 03:14:26 kensmith Exp $	*/
-<<<<
 /*	$KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $	*/
 
 /*-
@@ -609,10 +603,6 @@
 };
 
 #ifdef _KERNEL
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/netinet/icmp6.h#20
-#define	ICMP6STAT_ADD(name, val)	V_icmp6stat.name += (val)
-#define	ICMP6STAT_INC(name)		ICMP6STAT_ADD(name, 1)
-==== THEIRS //depot/vendor/freebsd/src/sys/netinet/icmp6.h#23
 /*
  * In-kernel consumers can use these accessor macros directly to update
  * stats.
@@ -626,10 +616,6 @@
 void	kmod_icmp6stat_inc(int statnum);
 #define	KMOD_ICMP6STAT_INC(name)					\
 	kmod_icmp6stat_inc(offsetof(struct icmp6stat, name) / sizeof(u_quad_t))
-==== YOURS //anchie_desnimis/gsoc2009-send/src/sys/netinet/icmp6.h
-#define		ICMP6STAT_ADD(name, val)	V_icmp6stat.name += (val)
-#define		ICMP6STAT_INC(name)		ICMP6STAT_ADD(name, 1)
-<<<<
 #endif