svn commit: r229698 - head/sys/net

[Gleb Smirnoff]

Author: glebius
Date: Fri Jan  6 12:05:43 2012
New Revision: 229698
URL: http://svn.freebsd.org/changeset/base/229698

Log:
  Since r228571 CARP is no longer an interface.

Modified:
  head/sys/net/if_media.h

Modified: head/sys/net/if_media.h
==============================================================================
--- head/sys/net/if_media.h	Fri Jan  6 11:42:03 2012	(r229697)
+++ head/sys/net/if_media.h	Fri Jan  6 12:05:43 2012	(r229698)
@@ -247,11 +247,6 @@ uint64_t	ifmedia_baudrate(int);
 #define	IFM_ATM_UNASSIGNED	0x00000400	/* unassigned cells */
 
 /*
- * CARP Common Address Redundancy Protocol
- */
-#define	IFM_CARP	0x000000c0
-
-/*
  * Shared media sub-types
  */
 #define	IFM_AUTO	0		/* Autoselect best media */
@@ -337,7 +332,6 @@ struct ifmedia_description {
 	{ IFM_FDDI,		"FDDI" },				\
 	{ IFM_IEEE80211,	"IEEE 802.11 Wireless Ethernet" },	\
 	{ IFM_ATM,		"ATM" },				\
-	{ IFM_CARP,		"Common Address Redundancy Protocol" }, \
 	{ 0, NULL },							\
 }
 
@@ -718,8 +712,6 @@ struct ifmedia_status_description {
 	    { "no network", "active" } },				\
 	{ IFM_ATM,		IFM_AVALID,	IFM_ACTIVE,		\
 	    { "no network", "active" } },				\
-	{ IFM_CARP,		IFM_AVALID,	IFM_ACTIVE,		\
-	    { "backup", "master" } },					\
 	{ 0,			0,		0,			\
 	    { NULL, NULL } }						\
 }