commit 880b69df3ee6495682724a7f7ffecb1ad13af030
Author: Ryota Ozaki <ozaki-r@iij.ad.jp>
Date:   Fri Jul 15 15:37:42 2016 +0900

    Revert "Revert part of "Switch the address list of intefaces to pslist(9)" (r1.220)"
    
    netstat uses sysctl to get address information from the kernel now,
    so we don't need to be afraid changing struct ifaddr.

diff --git a/sys/net/if.h b/sys/net/if.h
index 67d7e17..f8f5846 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -599,7 +599,9 @@ struct ifaddr {
 			               const struct sockaddr *);
 	uint32_t	*ifa_seqno;
 	int16_t	ifa_preference;	/* preference level for this address */
-	/* XXX adding variables here breaks kvm(3) users of struct *_ifaddr */
+#ifdef _KERNEL
+	struct pslist_entry     ifa_pslist_entry;
+#endif
 };
 #define	IFA_ROUTE	RTF_UP	/* (0x01) route installed */
 
@@ -1054,7 +1056,6 @@ __END_DECLS
 					    &(__ifp)->if_addrlist, ifa_list, __nifa)
 #define	IFADDR_EMPTY(__ifp)		TAILQ_EMPTY(&(__ifp)->if_addrlist)
 
-#ifdef notyet
 #define IFADDR_ENTRY_INIT(__ifa)					\
 	PSLIST_ENTRY_INIT((__ifa), ifa_pslist_entry)
 #define IFADDR_ENTRY_DESTROY(__ifa)					\
@@ -1100,34 +1101,6 @@ __END_DECLS
 			}						\
 		}							\
 	} while (0)
-#else
-#define IFADDR_ENTRY_INIT(__ifa)					\
-	do {} while (0)
-#define IFADDR_ENTRY_DESTROY(__ifa)					\
-	do {} while (0)
-#define IFADDR_READER_EMPTY(__ifp)					\
-	IFADDR_EMPTY(__ifp)
-#define IFADDR_READER_FIRST(__ifp)					\
-	IFADDR_FIRST(__ifp)
-#define IFADDR_READER_NEXT(__ifa)					\
-	IFADDR_NEXT(__ifa)
-#define IFADDR_READER_FOREACH(__ifa, __ifp)				\
-	IFADDR_FOREACH(__ifa, __ifp)
-#define IFADDR_WRITER_INSERT_HEAD(__ifp, __ifa)				\
-	do {} while (0)
-#define IFADDR_WRITER_REMOVE(__ifa)					\
-	do {} while (0)
-#define IFADDR_WRITER_FOREACH(__ifa, __ifp)				\
-	IFADDR_FOREACH(__ifa, __ifp)
-#define IFADDR_WRITER_NEXT(__ifp)					\
-	IFADDR_NEXT(__ifa)
-#define IFADDR_WRITER_INSERT_AFTER(__ifp, __new)			\
-	do {} while (0)
-#define IFADDR_WRITER_EMPTY(__ifp)					\
-	IFADDR_EMPTY(__ifp)
-#define IFADDR_WRITER_INSERT_TAIL(__ifp, __new)				\
-	do {} while (0)
-#endif /* notyet */
 
 #define	IFNET_LOCK()			mutex_enter(&ifnet_mtx)
 #define	IFNET_UNLOCK()			mutex_exit(&ifnet_mtx)