D8051.1794816467.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D8051.1794816467.diff
View Options

	Index: head/sys/net/if_var.h
	===================================================================
	--- head/sys/net/if_var.h
	+++ head/sys/net/if_var.h
	@@ -448,9 +448,6 @@
	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);
	Index: head/sys/netinet/sctp_bsd_addr.c
	===================================================================
	--- head/sys/netinet/sctp_bsd_addr.c
	+++ head/sys/netinet/sctp_bsd_addr.c
	@@ -214,7 +214,7 @@
	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 @@
	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);
	}
	}
	Index: head/sys/netpfil/pf/pf_if.c
	===================================================================
	--- head/sys/netpfil/pf/pf_if.c
	+++ head/sys/netpfil/pf/pf_if.c
	@@ -523,7 +523,7 @@
	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;