From: Don Skidmore <donald.c.skidmore@intel.com>
Date: Wed, 20 Jul 2011 02:27:05 +0000 (+0000)
Subject: ixgbe: fix __ixgbe_notify_dca() bail out code
X-Git-Tag: v2.6.39-400.9.0~619^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0afb14b537ebdc0a0e2844d867ba53f625acac12;p=users%2Fjedix%2Flinux-maple.git

ixgbe: fix __ixgbe_notify_dca() bail out code

The way __ixgbe_notify_dca() was currently set up it would not be
possible to add a requester. Both cases of the IXGBE_FLAG_DCA_ENABLED
bit being on and off would lead to the function exiting for a
DCA_PROVIDER_ADD.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 2a72c31ee4aa31b6a762390e4811a0edf5eefcef)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 4e6015d40705..de6ed9837dbb 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1061,7 +1061,7 @@ static int __ixgbe_notify_dca(struct device *dev, void *data)
 	struct ixgbe_adapter *adapter = dev_get_drvdata(dev);
 	unsigned long event = *(unsigned long *)data;
 
-	if (!(adapter->flags & IXGBE_FLAG_DCA_ENABLED))
+	if (!(adapter->flags & IXGBE_FLAG_DCA_CAPABLE))
 		return 0;
 
 	switch (event) {