summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2015-11-21 11:02:24 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2015-11-21 11:02:24 +0000
commit0524033be195c05700a4a14949cc75a086400190 (patch)
treee7fe216d04118f79234c90176e5aa3c1aea6adcc /sys/net
parent0ce79f9ae31cd0ac5c1de9c346ca4f26c60ad678 (diff)
dont check IFF_OACTIVE to see if the port is busy.
dont check if its busy at all, actually. fine with reyk@
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_trunk.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c
index 5e6e844463d..f6ebaa8f19b 100644
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_trunk.c,v 1.124 2015/11/20 05:33:54 dlg Exp $ */
+/* $OpenBSD: if_trunk.c,v 1.125 2015/11/21 11:02:23 dlg Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -295,10 +295,6 @@ trunk_port_create(struct trunk_softc *tr, struct ifnet *ifp)
if (tr->tr_count >= TRUNK_MAX_PORTS)
return (ENOSPC);
- /* New trunk port has to be in an idle state */
- if (ifp->if_flags & IFF_OACTIVE)
- return (EBUSY);
-
/* Check if port has already been associated to a trunk */
if (trunk_port_get(NULL, ifp) != NULL)
return (EBUSY);