---

yaml --- r: 162869 b: refs/heads/master c: 1b3ff02 h: refs/heads/master i: 162867: 21f1caa v: v3
git-mirror · Sep 15, 2009 · dec66a0 · dec66a0
1 parent b946f8f
commit dec66a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce187619e8f39abd60a8d99eeb2c52b4c00adc13
+refs/heads/master: 1b3ff02eac6dcb6d7d03a5be6a642b58ec9cf4bb
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -2055,6 +2055,8 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
 
 		if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED)
 			rx_ring->flags |= IXGBE_RING_RX_PS_ENABLED;
+		else
+			rx_ring->flags &= ~IXGBE_RING_RX_PS_ENABLED;
 
 #ifdef IXGBE_FCOE
 		if (netdev->features & NETIF_F_FCOE_MTU) {