Undo damage from wrong MFC to HEAD.

Pointed out by:	jkim, remko

1 files changed, 0 insertions, 38 deletions

diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index ccf406c..f387c9c 100644
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -263,15 +263,6 @@ uint64_t	ifmedia_baudrate(int);
 #define	IFM_MSHIFT	16		/* Mode shift */
 #define	IFM_GMASK	0x0ff00000	/* Global options */
 
-/* Mask of "status valid" bits, for ifconfig(8). */
-#define	IFM_STATUS_VALID	IFM_AVALID
-
-/* List of "status valid" bits, for ifconfig(8). */
-#define IFM_STATUS_VALID_LIST {						\
-        IFM_AVALID,							\
-        0								\
-}
-
 /*
  * Status bits
  */
@@ -648,33 +639,4 @@ struct ifmedia_status_description {
 	{ 0,			0,		0,			\
 	    { NULL, NULL } }						\
 }
-/*
- * Status descriptions for the various media types.
- */
-struct ifmedia_status_description {
-	int	   ifms_type;
-	int	   ifms_valid;
-	int	   ifms_bit;
-	const char *ifms_string[2];
-};
-
-#define IFM_STATUS_DESC(ifms, bit)					\
-	(ifms)->ifms_string[((ifms)->ifms_bit & (bit)) ? 1 : 0]
-
-#define IFM_STATUS_DESCRIPTIONS {					\
-	{ IFM_ETHER,		IFM_AVALID,	IFM_ACTIVE,		\
-	    { "no carrier", "active" } },				\
-	{ IFM_FDDI,		IFM_AVALID,	IFM_ACTIVE,		\
-	    { "no ring", "inserted" } },				\
-	{ IFM_TOKEN,		IFM_AVALID,	IFM_ACTIVE,		\
-	    { "no ring", "inserted" } },				\
-	{ IFM_IEEE80211,	IFM_AVALID,	IFM_ACTIVE,		\
-	    { "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 } }						\
-}
 #endif	/* _NET_IF_MEDIA_H_ */