diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2011-07-04 04:29:18 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2011-07-04 04:29:18 +0000 |
| commit | ef5f1b83a6551f7b66a6fb3c9960750efe43882a (patch) | |
| tree | 39de6aa19a14bab7ac054d92e2b8c1db4f81461e /sys/net/if_trunk.h | |
| parent | 7c72c5061a097ed3358cd701f56f4a8918038be1 (diff) | |
LINK_STATE cleanup. It is no longer needed to special case carp(4).
LINK_STATE_IS_UP() does the trick now for all cases.
OK henning@ deraadt@
Diffstat (limited to 'sys/net/if_trunk.h')
| -rw-r--r-- | sys/net/if_trunk.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/net/if_trunk.h b/sys/net/if_trunk.h index 6b26d02876b..2d0763527ee 100644 --- a/sys/net/if_trunk.h +++ b/sys/net/if_trunk.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trunk.h,v 1.16 2008/06/15 06:56:09 mpf Exp $ */ +/* $OpenBSD: if_trunk.h,v 1.17 2011/07/04 04:29:17 claudio Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -150,8 +150,7 @@ struct trunk_port { #define tp_capabilities tp_if->if_capabilities /* capabilities */ #define TRUNK_PORTACTIVE(_tp) ( \ - (LINK_STATE_IS_UP((_tp)->tp_link_state) || \ - (_tp)->tp_link_state == LINK_STATE_UNKNOWN) && \ + LINK_STATE_IS_UP((_tp)->tp_link_state) && \ (_tp)->tp_ifflags & IFF_UP) struct trunk_mc { |