Index: if_trunk.c
===================================================================
RCS file: /cvs/src/sys/net/if_trunk.c,v
retrieving revision 1.124
diff -u -p -r1.124 if_trunk.c
--- if_trunk.c	20 Nov 2015 05:33:54 -0000	1.124
+++ if_trunk.c	20 Nov 2015 05:35:07 -0000
@@ -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.123 2015/11/12 10:07:14 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -296,7 +296,7 @@ trunk_port_create(struct trunk_softc *tr
 		return (ENOSPC);
 
 	/* New trunk port has to be in an idle state */
-	if (ifp->if_flags & IFF_OACTIVE)
+	if (!ifq_empty(&ifp->if_snd))
 		return (EBUSY);
 
 	/* Check if port has already been associated to a trunk */