From dec66a03f12f08964bf5afb25dcf841d5dad37fe Mon Sep 17 00:00:00 2001
From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Date: Mon, 14 Sep 2009 07:47:27 +0000
Subject: [PATCH] --- yaml --- r: 162869 b: refs/heads/master c:
 1b3ff02eac6dcb6d7d03a5be6a642b58ec9cf4bb h: refs/heads/master i:   162867:
 21f1caa0f133c4b440fd44c5ddfecb4228064b73 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ixgbe/ixgbe_main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9726f7ac5975..ca40ec8c99b7 100644
--- 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
index 45bf8b9716e3..b47aaa881334 100644
--- 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) {