svn commit: r306407 - in head/sys: net netinet netpfil/pf
Kevin Lo
kevlo at FreeBSD.org
Wed Sep 28 13:29:12 UTC 2016
Author: kevlo
Date: Wed Sep 28 13:29:11 2016
New Revision: 306407
URL: https://svnweb.freebsd.org/changeset/base/306407
Log:
Remove ifa_list, use ifa_link (structure field) instead.
While here, prefer if_addrhead (FreeBSD) to if_addrlist (BSD compat) naming
for the interface address list in sctp_bsd_addr.c
Reviewed by: tuexen
Differential Revision: https://reviews.freebsd.org/D8051
Modified:
head/sys/net/if_var.h
head/sys/netinet/sctp_bsd_addr.c
head/sys/netpfil/pf/pf_if.c
Modified: head/sys/net/if_var.h
==============================================================================
--- head/sys/net/if_var.h Wed Sep 28 12:23:46 2016 (r306406)
+++ head/sys/net/if_var.h Wed Sep 28 13:29:11 2016 (r306407)
@@ -448,9 +448,6 @@ struct ifaddr {
counter_u64_t ifa_obytes;
};
-/* For compatibility with other BSDs. SCTP uses it. */
-#define ifa_list ifa_link
-
struct ifaddr * ifa_alloc(size_t size, int flags);
void ifa_free(struct ifaddr *ifa);
void ifa_ref(struct ifaddr *ifa);
Modified: head/sys/netinet/sctp_bsd_addr.c
==============================================================================
--- head/sys/netinet/sctp_bsd_addr.c Wed Sep 28 12:23:46 2016 (r306406)
+++ head/sys/netinet/sctp_bsd_addr.c Wed Sep 28 13:29:11 2016 (r306407)
@@ -214,7 +214,7 @@ sctp_init_ifns_for_vrf(int vrfid)
continue;
}
IF_ADDR_RLOCK(ifn);
- TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifn->if_addrhead, ifa_link) {
if (ifa->ifa_addr == NULL) {
continue;
}
@@ -365,7 +365,7 @@ void
if (!(*pred) (ifn)) {
continue;
}
- TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifn->if_addrhead, ifa_link) {
sctp_addr_change(ifa, add ? RTM_ADD : RTM_DELETE);
}
}
Modified: head/sys/netpfil/pf/pf_if.c
==============================================================================
--- head/sys/netpfil/pf/pf_if.c Wed Sep 28 12:23:46 2016 (r306406)
+++ head/sys/netpfil/pf/pf_if.c Wed Sep 28 13:29:11 2016 (r306407)
@@ -523,7 +523,7 @@ pfi_instance_add(struct ifnet *ifp, int
int net2, af;
IF_ADDR_RLOCK(ifp);
- TAILQ_FOREACH(ia, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ia, &ifp->if_addrhead, ifa_link) {
if (ia->ifa_addr == NULL)
continue;
af = ia->ifa_addr->sa_family;
More information about the svn-src-all
mailing list