summaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/igb_main.c
diff options
context:
space:
mode:
authorCarolyn Wyborny <carolyn.wyborny@intel.com>2011-03-12 05:43:18 +0100
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-03-12 13:09:37 +0100
commit4322e561a93ec7ee034b603a6c610e7be90d4e8a (patch)
treea3260a88662c8a2b65233513bac17faffc0f64bf /drivers/net/igb/igb_main.c
parentigb: Add Energy Efficient Ethernet (EEE) for i350 devices. (diff)
downloadlinux-4322e561a93ec7ee034b603a6c610e7be90d4e8a.tar.xz
linux-4322e561a93ec7ee034b603a6c610e7be90d4e8a.zip
igb: Update NVM functions to work with i350 devices
This patch adds functions and functions pointers to accommodate differences between NVM interfaces and options for i350 devices, 82580 devices and the rest. Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to '')
-rw-r--r--drivers/net/igb/igb_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 8643f8c29199..8c6af11d93a6 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1884,7 +1884,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
hw->mac.ops.reset_hw(hw);
/* make sure the NVM is good */
- if (igb_validate_nvm_checksum(hw) < 0) {
+ if (hw->nvm.ops.validate(hw) < 0) {
dev_err(&pdev->dev, "The NVM Checksum Is Not Valid\n");
err = -EIO;
goto err_eeprom;