Index: if_ix.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_ix.c,v
retrieving revision 1.150
diff -u -p -r1.150 if_ix.c
--- if_ix.c	24 Jan 2017 03:57:35 -0000	1.150
+++ if_ix.c	18 Feb 2017 13:08:32 -0000
@@ -637,7 +637,7 @@ ixgbe_init(void *arg)
 	ixgbe_initialize_transmit_units(sc);
 
 	/* Use 2k clusters, even for jumbo frames */
-	sc->rx_mbuf_sz = MCLBYTES + ETHER_ALIGN;
+	sc->rx_mbuf_sz = MCLBYTES + 16 + ETHER_ALIGN;
 
 	/* Prepare receive descriptors and buffers */
 	if (ixgbe_setup_receive_structures(sc)) {
@@ -1622,10 +1622,6 @@ ixgbe_setup_interface(struct ix_softc *s
 
 	ifp->if_capabilities = IFCAP_VLAN_MTU;
 
-#if NVLAN > 0
-	ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING;
-#endif
-
 #ifdef IX_CSUM_OFFLOAD
 	ifp->if_capabilities |= IFCAP_CSUM_TCPv4 | IFCAP_CSUM_UDPv4;
 #endif
@@ -2446,7 +2442,7 @@ ixgbe_get_buf(struct rx_ring *rxr, int i
 		return (ENOBUFS);
 
 	mp->m_len = mp->m_pkthdr.len = sc->rx_mbuf_sz;
-	m_adj(mp, ETHER_ALIGN);
+	m_adj(mp, 16 + ETHER_ALIGN);
 
 	error = bus_dmamap_load_mbuf(rxr->rxdma.dma_tag, rxbuf->map,
 	    mp, BUS_DMA_NOWAIT);
@@ -2651,7 +2647,7 @@ ixgbe_initialize_receive_units(struct ix
 	hlreg |= IXGBE_HLREG0_JUMBOEN;
 	IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg);
 
-	bufsz = (sc->rx_mbuf_sz - ETHER_ALIGN) >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;
+	bufsz = (sc->rx_mbuf_sz - (16 + ETHER_ALIGN)) >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;
 
 	for (i = 0; i < sc->num_queues; i++, rxr++) {
 		uint64_t rdba = rxr->rxdma.dma_map->dm_segs[0].ds_addr;