]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ixgbe: fix __ixgbe_notify_dca() bail out code
authorDon Skidmore <donald.c.skidmore@intel.com>
Wed, 20 Jul 2011 02:27:05 +0000 (02:27 +0000)
committerJoe Jin <joe.jin@oracle.com>
Fri, 3 Feb 2012 01:21:26 +0000 (09:21 +0800)
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>
drivers/net/ixgbe/ixgbe_main.c

index 4e6015d407058a81efc73a1086e520cef625f978..de6ed9837dbb758229578c5f0c67ff431f1840c3 100644 (file)
@@ -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) {