svn commit: r293338 - head/sys/dev/ixgbe

[Sean Bruno]

Author: sbruno
Date: Thu Jan  7 18:34:56 2016
New Revision: 293338
URL: https://svnweb.freebsd.org/changeset/base/293338

Log:
  Fix VF handling of VLANs.
  
  This helps immensily with our ability to operate in the Amazon Cloud.
  
  Discussed on Intel Networking Community call this morning.
  
  Submitted by:	Jarrod Petz(petz at nisshoko.net)
  MFC after:	2 weeks
  Differential Revision:	https://reviews.freebsd.org/D4788

Modified:
  head/sys/dev/ixgbe/if_ixv.c

Modified: head/sys/dev/ixgbe/if_ixv.c
==============================================================================
--- head/sys/dev/ixgbe/if_ixv.c	Thu Jan  7 18:24:24 2016	(r293337)
+++ head/sys/dev/ixgbe/if_ixv.c	Thu Jan  7 18:34:56 2016	(r293338)
@@ -1664,7 +1664,7 @@ ixv_initialize_receive_units(struct adap
 
 		/* Disable the queue */
 		rxdctl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(i));
-		rxdctl &= ~(IXGBE_RXDCTL_ENABLE | IXGBE_RXDCTL_VME);
+		rxdctl &= ~IXGBE_RXDCTL_ENABLE;
 		IXGBE_WRITE_REG(hw, IXGBE_VFRXDCTL(i), rxdctl);
 		for (int j = 0; j < 10; j++) {
 			if (IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(i)) &
@@ -1698,8 +1698,7 @@ ixv_initialize_receive_units(struct adap
 		rxr->tail = IXGBE_VFRDT(rxr->me);
 
 		/* Do the queue enabling last */
-		rxdctl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(i));
-		rxdctl |= IXGBE_RXDCTL_ENABLE;
+		rxdctl |= IXGBE_RXDCTL_ENABLE | IXGBE_RXDCTL_VME;
 		IXGBE_WRITE_REG(hw, IXGBE_VFRXDCTL(i), rxdctl);
 		for (int k = 0; k < 10; k++) {
 			if (IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(i)) &