diff options
author | Auke Kok <auke\-jan.h.kok@intel.com> | 2006-09-27 15:54:19 -0400 |
---|---|---|
committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-09-27 15:54:19 -0400 |
commit | f7d4fa014146f3116372fcec9050555bb4287951 (patch) | |
tree | e408cd7782547fd9eec04b69c34a1ba6375e9427 | |
parent | a4d3c54024beff40d4e5e4647ad212696e0ea354 (diff) |
ixgb: convert to netdev_priv(netdev)
PCI error recovery code recently merged needs to use netdev_priv
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index fb4c1ad745b2..5cce91723f76 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -2230,7 +2230,7 @@ static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev, | |||
2230 | enum pci_channel_state state) | 2230 | enum pci_channel_state state) |
2231 | { | 2231 | { |
2232 | struct net_device *netdev = pci_get_drvdata(pdev); | 2232 | struct net_device *netdev = pci_get_drvdata(pdev); |
2233 | struct ixgb_adapter *adapter = netdev->priv; | 2233 | struct ixgb_adapter *adapter = netdev_priv(netdev); |
2234 | 2234 | ||
2235 | if(netif_running(netdev)) | 2235 | if(netif_running(netdev)) |
2236 | ixgb_down(adapter, TRUE); | 2236 | ixgb_down(adapter, TRUE); |
@@ -2253,7 +2253,7 @@ static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev, | |||
2253 | static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev) | 2253 | static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev) |
2254 | { | 2254 | { |
2255 | struct net_device *netdev = pci_get_drvdata(pdev); | 2255 | struct net_device *netdev = pci_get_drvdata(pdev); |
2256 | struct ixgb_adapter *adapter = netdev->priv; | 2256 | struct ixgb_adapter *adapter = netdev_priv(netdev); |
2257 | 2257 | ||
2258 | if(pci_enable_device(pdev)) { | 2258 | if(pci_enable_device(pdev)) { |
2259 | DPRINTK(PROBE, ERR, "Cannot re-enable PCI device after reset.\n"); | 2259 | DPRINTK(PROBE, ERR, "Cannot re-enable PCI device after reset.\n"); |
@@ -2297,7 +2297,7 @@ static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev) | |||
2297 | static void ixgb_io_resume (struct pci_dev *pdev) | 2297 | static void ixgb_io_resume (struct pci_dev *pdev) |
2298 | { | 2298 | { |
2299 | struct net_device *netdev = pci_get_drvdata(pdev); | 2299 | struct net_device *netdev = pci_get_drvdata(pdev); |
2300 | struct ixgb_adapter *adapter = netdev->priv; | 2300 | struct ixgb_adapter *adapter = netdev_priv(netdev); |
2301 | 2301 | ||
2302 | pci_set_master(pdev); | 2302 | pci_set_master(pdev); |
2303 | 2303 | ||