diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2006-12-07 18:15:30 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2006-12-07 18:15:30 +0000 |
| commit | 313afe4cd322ccf6e48879dc37544d137f3b2d08 (patch) | |
| tree | eea8b181d9b8060362cf0a005bcfe3b7fe476656 | |
| parent | ac8af663f831fa21d73e0db7b9031f576ae077d5 (diff) | |
use LINK_STATE_IS_UP(ifp0->if_link_state) instead of
ifp0->if_link_state == LINK_STATE_UP to handle the new half/full
duplex link states. i forgot to commit these snippets before.
ok jsg@
| -rw-r--r-- | sys/net/if_ethersubr.c | 4 | ||||
| -rw-r--r-- | sys/net/if_fddisubr.c | 4 | ||||
| -rw-r--r-- | sys/net/if_tokensubr.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 940b4d9e46d..cdf78cb50c1 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.104 2006/10/31 14:28:29 jason Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.105 2006/12/07 18:15:29 reyk Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -235,7 +235,7 @@ ether_output(ifp0, m0, dst, rt0) struct ifaddr *ifa; /* loop back if this is going to the carp interface */ - if (dst != NULL && ifp0->if_link_state == LINK_STATE_UP && + if (dst != NULL && LINK_STATE_IS_UP(ifp0->if_link_state) && (ifa = ifa_ifwithaddr(dst)) != NULL && ifa->ifa_ifp == ifp0) return (looutput(ifp0, m, dst, rt0)); diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index a15fb7bde22..f0180182293 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fddisubr.c,v 1.49 2006/06/16 16:49:39 henning Exp $ */ +/* $OpenBSD: if_fddisubr.c,v 1.50 2006/12/07 18:15:29 reyk Exp $ */ /* $NetBSD: if_fddisubr.c,v 1.5 1996/05/07 23:20:21 christos Exp $ */ /* @@ -158,7 +158,7 @@ fddi_output(ifp0, m0, dst, rt0) struct ifaddr *ifa; /* loop back if this is going to the carp interface */ - if (dst != NULL && ifp0->if_link_state == LINK_STATE_UP && + if (dst != NULL && LINK_STATE_IS_UP(ifp0->if_link_state) && (ifa = ifa_ifwithaddr(dst)) != NULL && ifa->ifa_ifp == ifp0) return (looutput(ifp0, m, dst, rt0)); diff --git a/sys/net/if_tokensubr.c b/sys/net/if_tokensubr.c index 3007ce6235a..c00969a38ff 100644 --- a/sys/net/if_tokensubr.c +++ b/sys/net/if_tokensubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tokensubr.c,v 1.23 2006/09/26 13:11:38 pedro Exp $ */ +/* $OpenBSD: if_tokensubr.c,v 1.24 2006/12/07 18:15:29 reyk Exp $ */ /* $NetBSD: if_tokensubr.c,v 1.7 1999/05/30 00:39:07 bad Exp $ */ /* @@ -136,7 +136,7 @@ token_output(ifp0, m0, dst, rt0) struct ifaddr *ifa; /* loop back if this is going to the carp interface */ - if (dst != NULL && ifp0->if_link_state == LINK_STATE_UP && + if (dst != NULL && LINK_STATE_IS_UP(ifp0->if_link_state) && (ifa = ifa_ifwithaddr(dst)) != NULL && ifa->ifa_ifp == ifp0) return (looutput(ifp0, m, dst, rt0)); |