Home » Mailing list archives » linux-netdev » 2008 » March » 27

Re: [PATCH] [IXBGE]: Compilation fix for ixgbe_main.c.

Previous thread: net-2.6.26 compilation is still broken by Denis V. Lunev on Thursday, March 27, 2008 - 7:33 am. (2 messages)

Next thread: SCTP control socket question by Denis V. Lunev on Thursday, March 27, 2008 - 8:03 am. (8 messages)
[view original message]
From: Denis V. Lunev <den@...>
To: <davem@...>
Cc: <netdev@...>, <cramerj@...>, <auke-jan.h.kok@...>, <jeff@...>, Denis V. Lunev <den@...>
Subject: [PATCH] [IXBGE]: Compilation fix for ixgbe_main.c.
Date: Thursday, March 27, 2008 - 7:39 am

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 <den@openvz.org>

---

 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 */

--

1.5.3.rc5


--
[view original message]
From: Jeff Garzik <jeff@...>
To: Denis V. Lunev <den@...>
Cc: <davem@...>, <netdev@...>, <cramerj@...>, <auke-jan.h.kok@...>
Subject: Re: [PATCH] [IXBGE]: Compilation fix for ixgbe_main.c.
Date: Friday, March 28, 2008 - 10:15 pm

applied


--
[view original message]
From: Kok, Auke <auke-jan.h.kok@...>
To: Denis V. Lunev <den@...>, <jeff@...>
Cc: <davem@...>, <netdev@...>, <cramerj@...>, <auke-jan.h.kok@...>
Subject: Re: [PATCH] [IXBGE]: Compilation fix for ixgbe_main.c.
Date: Thursday, March 27, 2008 - 11:26 am

Ack and thanks, but should go to Jeff Garzik instead.


Jeff, please apply.


--
Previous thread: net-2.6.26 compilation is still broken by Denis V. Lunev on Thursday, March 27, 2008 - 7:33 am. (2 messages)

Next thread: SCTP control socket question by Denis V. Lunev on Thursday, March 27, 2008 - 8:03 am. (8 messages)