diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-07-18 16:10:04 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-07-18 16:10:04 +0000 |
| commit | 23a2f7955938be362e65acbc7666816134d8649c (patch) | |
| tree | d8ba9428141830966a21c9cc5805a0808b4644c6 /sys/net/if.c | |
| parent | bba92d5355ab193337ef6636ee333071be41fcca (diff) | |
There's no longer a need to force carp(4) interfaces to be the last ones
in the &ifnet list of interfaces.
carp(4) is slowly becoming less special. Should keep the carp interfaces
in the correct order in ifconfig output as reported by Johan Huldtgren.
ok florian@, claudio@, benno@
Diffstat (limited to 'sys/net/if.c')
| -rw-r--r-- | sys/net/if.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index d0e6c1373d1..76ff37080cc 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.351 2015/07/18 15:51:16 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.352 2015/07/18 16:10:03 mpi Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -373,24 +373,8 @@ if_attachhead(struct ifnet *ifp) void if_attach(struct ifnet *ifp) { -#if NCARP > 0 - struct ifnet *before = NULL; -#endif - if_attach_common(ifp); - -#if NCARP > 0 - if (ifp->if_type != IFT_CARP) - TAILQ_FOREACH(before, &ifnet, if_list) - if (before->if_type == IFT_CARP) - break; - if (before == NULL) - TAILQ_INSERT_TAIL(&ifnet, ifp, if_list); - else - TAILQ_INSERT_BEFORE(before, ifp, if_list); -#else TAILQ_INSERT_TAIL(&ifnet, ifp, if_list); -#endif if_attachsetup(ifp); } |