1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index a858c6ff80dd..d37465020bcc 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5632,12 +5632,12 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 np->desc_ver = DESC_VER_3;
                 np->txrxctl_bits = NVREG_TXRXCTL_DESC_3;
                 if (dma_64bit) {
-                        if (pci_set_dma_mask(pci_dev, DMA_39BIT_MASK))
+                        if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(39)))
                                 dev_printk(KERN_INFO, &pci_dev->dev,
                                         "64-bit DMA failed, using 32-bit addressing\n");
                         else
                                 dev->features |= NETIF_F_HIGHDMA;
-                        if (pci_set_consistent_dma_mask(pci_dev, DMA_39BIT_MASK)) {
+                        if (pci_set_consistent_dma_mask(pci_dev, DMA_BIT_MASK(39))) {
                                 dev_printk(KERN_INFO, &pci_dev->dev,
                                         "64-bit DMA (consistent) failed, using 32-bit ring buffers\n");
                         }
@@ -6117,6 +6117,9 @@ static int nv_resume(struct pci_dev *pdev)
 
         pci_write_config_dword(pdev, NV_MSI_PRIV_OFFSET, NV_MSI_PRIV_VALUE);
 
+        /* restore phy state, including autoneg */
+        phy_init(dev);
+
         netif_device_attach(dev);
         if (netif_running(dev)) {
                 rc = nv_open(dev);