Module Name: src
Committed By: ozaki-r
Date: Mon Jul 11 02:14:27 UTC 2016
Modified Files:
src/sys/net: if.h
Log Message:
Revert part of "Switch the address list of intefaces to pslist(9)" (r1.220)
Reverting the whole change set just messes up many files uselessly
because changes to them (except for if.h) are proper.
- Remove ifa_pslist_entry that breaks kvm(3) users (e.g., netstat -ia)
- Change IFADDR_{READER,WRITER}_* macros to use old IFADDR_* (or just NOP)
for now
Fix PR kern/51325
To generate a diff of this commit:
cvs rdiff -u -r1.220 -r1.221 src/sys/net/if.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.220 src/sys/net/if.h:1.221
--- src/sys/net/if.h:1.220 Thu Jul 7 09:32:02 2016
+++ src/sys/net/if.h Mon Jul 11 02:14:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.220 2016/07/07 09:32:02 ozaki-r Exp $ */
+/* $NetBSD: if.h,v 1.221 2016/07/11 02:14:27 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -599,9 +599,7 @@ struct ifaddr {
const struct sockaddr *);
uint32_t *ifa_seqno;
int16_t ifa_preference; /* preference level for this address */
-#ifdef _KERNEL
- struct pslist_entry ifa_pslist_entry;
-#endif
+ /* XXX adding variables here breaks kvm(3) users of struct *_ifaddr */
};
#define IFA_ROUTE RTF_UP /* (0x01) route installed */
@@ -1056,6 +1054,7 @@ __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) \
@@ -1101,6 +1100,34 @@ __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)
