* [PATCH] [IXBGE]: Compilation fix for ixgbe_main.c.
@ 2008-03-27 11:39 Denis V. Lunev
2008-03-27 15:26 ` Kok, Auke
2008-03-29 2:15 ` Jeff Garzik
0 siblings, 2 replies; 3+ messages in thread
From: Denis V. Lunev @ 2008-03-27 11:39 UTC (permalink / raw)
To: davem; +Cc: netdev, cramerj, auke-jan.h.kok, jeff, Denis V. Lunev
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] [IXBGE]: Compilation fix for ixgbe_main.c.
2008-03-27 11:39 [PATCH] [IXBGE]: Compilation fix for ixgbe_main.c Denis V. Lunev
@ 2008-03-27 15:26 ` Kok, Auke
2008-03-29 2:15 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Kok, Auke @ 2008-03-27 15:26 UTC (permalink / raw)
To: Denis V. Lunev, jeff; +Cc: davem, netdev, cramerj, auke-jan.h.kok
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 <den@openvz.org>
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 */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] [IXBGE]: Compilation fix for ixgbe_main.c.
2008-03-27 11:39 [PATCH] [IXBGE]: Compilation fix for ixgbe_main.c Denis V. Lunev
2008-03-27 15:26 ` Kok, Auke
@ 2008-03-29 2:15 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2008-03-29 2:15 UTC (permalink / raw)
To: Denis V. Lunev; +Cc: davem, netdev, cramerj, auke-jan.h.kok
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 <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;
applied
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-03-29 2:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-27 11:39 [PATCH] [IXBGE]: Compilation fix for ixgbe_main.c Denis V. Lunev
2008-03-27 15:26 ` Kok, Auke
2008-03-29 2:15 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).