From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Kok, Auke" Subject: Re: [PATCH] [IXBGE]: Compilation fix for ixgbe_main.c. Date: Thu, 27 Mar 2008 08:26:18 -0700 Message-ID: <47EBBC9A.8010409@intel.com> References: <1206617957-32679-1-git-send-email-den@openvz.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: davem@davemloft.net, netdev@vger.kernel.org, cramerj@intel.com, auke-jan.h.kok@intel.com To: "Denis V. Lunev" , jeff@garzik.org Return-path: Received: from mga03.intel.com ([143.182.124.21]:62813 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756687AbYC0P07 (ORCPT ); Thu, 27 Mar 2008 11:26:59 -0400 In-Reply-To: <1206617957-32679-1-git-send-email-den@openvz.org> Sender: netdev-owner@vger.kernel.org List-ID: Denis V. Lunev wrote: > Under CONFIG_DCA the compilation is broken since the commit > bd0362dde080cef377d99fa5beb5c25308c29c73 (ixgbe: Add optional > DCA infrastructure). > > IXGBE_SUCCESS is not defined anywhere, replace it with 0. > > Signed-off-by: Denis V. Lunev Ack and thanks, but should go to Jeff Garzik instead. Jeff, please apply. Auke > --- > drivers/net/ixgbe/ixgbe_main.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c > index 7ad2993..cb371a8 100644 > --- a/drivers/net/ixgbe/ixgbe_main.c > +++ b/drivers/net/ixgbe/ixgbe_main.c > @@ -367,7 +367,7 @@ static int __ixgbe_notify_dca(struct device *dev, void *data) > /* Always use CB2 mode, difference is masked > * in the CB driver. */ > IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 2); > - if (dca_add_requester(dev) == IXGBE_SUCCESS) { > + if (dca_add_requester(dev) == 0) { > ixgbe_setup_dca(adapter); > break; > } > @@ -381,7 +381,7 @@ static int __ixgbe_notify_dca(struct device *dev, void *data) > break; > } > > - return IXGBE_SUCCESS; > + return 0; > } > > #endif /* CONFIG_DCA */ > @@ -3605,7 +3605,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, > goto err_register; > > #ifdef CONFIG_DCA > - if (dca_add_requester(&pdev->dev) == IXGBE_SUCCESS) { > + if (dca_add_requester(&pdev->dev) == 0) { > adapter->flags |= IXGBE_FLAG_DCA_ENABLED; > /* always use CB2 mode, difference is masked > * in the CB driver */