From c2b5ba76611cfd64d6d72cbb0f5d4e6a008869d7 Mon Sep 17 00:00:00 2001 From: Kevin Lo Date: Thu, 6 Oct 2016 00:51:27 +0000 Subject: [PATCH] Remove an alias if_list, use if_link consistently. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D8075 --- sys/net/altq/altq_subr.c | 2 +- sys/net/if_var.h | 1 - sys/netinet/sctp_bsd_addr.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c index c5093d82eb3d..ae5959ad7d78 100644 --- a/sys/net/altq/altq_subr.c +++ b/sys/net/altq/altq_subr.c @@ -435,7 +435,7 @@ tbr_timeout(arg) VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); for (ifp = TAILQ_FIRST(&V_ifnet); ifp; - ifp = TAILQ_NEXT(ifp, if_list)) { + ifp = TAILQ_NEXT(ifp, if_link)) { /* read from if_snd unlocked */ if (!TBR_IS_ENABLED(&ifp->if_snd)) continue; diff --git a/sys/net/if_var.h b/sys/net/if_var.h index b4863323120f..8632ea2f3af3 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -313,7 +313,6 @@ struct ifnet { }; /* for compatibility with other BSDs */ -#define if_list if_link #define if_name(ifp) ((ifp)->if_xname) /* diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index 2cd0416606c4..9276a20990c6 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -208,7 +208,7 @@ sctp_init_ifns_for_vrf(int vrfid) #endif IFNET_RLOCK(); - TAILQ_FOREACH(ifn, &MODULE_GLOBAL(ifnet), if_list) { + TAILQ_FOREACH(ifn, &MODULE_GLOBAL(ifnet), if_link) { if (sctp_is_desired_interface_type(ifn) == 0) { /* non desired type */ continue; @@ -361,7 +361,7 @@ void struct ifaddr *ifa; IFNET_RLOCK(); - TAILQ_FOREACH(ifn, &MODULE_GLOBAL(ifnet), if_list) { + TAILQ_FOREACH(ifn, &MODULE_GLOBAL(ifnet), if_link) { if (!(*pred) (ifn)) { continue; }