Index: if_admsw.c
===================================================================
--- if_admsw.c	(revision 221750)
+++ if_admsw.c	(working copy)
@@ -118,7 +118,7 @@
 #define ADMSW_UNLOCK(sc) do {} while(0);
 
 static uint8_t vlan_matrix[SW_DEVS] = {
-	(1 << 6) | (1 << 0),		/* CPU + port0 */
+	(1 << 6) |     0x3f,		/* CPU + all ports */
 	(1 << 6) | (1 << 1),		/* CPU + port1 */
 	(1 << 6) | (1 << 2),		/* CPU + port2 */
 	(1 << 6) | (1 << 3),		/* CPU + port3 */
@@ -614,7 +614,7 @@
 			if ((ifp->if_drv_flags & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) 
 			    == IFF_DRV_RUNNING) {
 				/* Grab a packet off the queue. */
-				IF_DEQUEUE(&ifp->if_snd, m0);
+				IFQ_DRV_DEQUEUE(&ifp->if_snd, m0);
 				if (m0 != NULL)
 					break;
 			}