From edac35b86aa7184a8e91989ba7712fd0ed63caf8 Mon Sep 17 00:00:00 2001 From: "Denis V. Lunev" Date: Thu, 27 Mar 2008 14:39:17 +0300 Subject: [PATCH] --- yaml --- r: 90469 b: refs/heads/master c: 652f093fdf14c7ca1e13c052da429ae385e4dc21 h: refs/heads/master i: 90467: eb0f865dc2dcc54fd3929cebcb9748ba60c39937 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a9bb38ec165f..41fd69106b1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80950f8b71176ae8b6f2a78de039b8bc2da7f480 +refs/heads/master: 652f093fdf14c7ca1e13c052da429ae385e4dc21 diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index 7ad2993dc581..cb371a8c24a7 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/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 */