1 files changed, 28 insertions, 21 deletions

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index e8bfcce6b319..5894716de19f 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1880,7 +1880,6 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
         } else {
                 dev->stats.rx_packets++;
                 dev->stats.rx_bytes += actual_size;
-                nic->netdev->last_rx = jiffies;
                 netif_receive_skb(skb);
                 if(work_done)
                         (*work_done)++;
@@ -2322,7 +2321,8 @@ static int e100_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 {
         struct nic *nic = netdev_priv(netdev);
 
-        if(wol->wolopts != WAKE_MAGIC && wol->wolopts != 0)
+        if ((wol->wolopts && wol->wolopts != WAKE_MAGIC) ||
+            !device_can_wakeup(&nic->pdev->dev))
                 return -EOPNOTSUPP;
 
         if(wol->wolopts)
@@ -2330,6 +2330,8 @@ static int e100_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
         else
                 nic->flags &= ~wol_magic;
 
+        device_set_wakeup_enable(&nic->pdev->dev, wol->wolopts);
+
         e100_exec_cb(nic, NULL, e100_configure);
 
         return 0;
@@ -2610,13 +2612,26 @@ static int e100_close(struct net_device *netdev)
         return 0;
 }
 
+static const struct net_device_ops e100_netdev_ops = {
+        .ndo_open               = e100_open,
+        .ndo_stop               = e100_close,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_set_multicast_list = e100_set_multicast_list,
+        .ndo_set_mac_address    = e100_set_mac_address,
+        .ndo_change_mtu         = e100_change_mtu,
+        .ndo_do_ioctl           = e100_do_ioctl,
+        .ndo_tx_timeout         = e100_tx_timeout,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller    = e100_netpoll,
+#endif
+};
+
 static int __devinit e100_probe(struct pci_dev *pdev,
         const struct pci_device_id *ent)
 {
         struct net_device *netdev;
         struct nic *nic;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         if(!(netdev = alloc_etherdev(sizeof(struct nic)))) {
                 if(((1 << debug) - 1) & NETIF_MSG_PROBE)
@@ -2624,19 +2639,10 @@ static int __devinit e100_probe(struct pci_dev *pdev,
                 return -ENOMEM;
         }
 
-        netdev->open = e100_open;
-        netdev->stop = e100_close;
+        netdev->netdev_ops = &e100_netdev_ops;
         netdev->hard_start_xmit = e100_xmit_frame;
-        netdev->set_multicast_list = e100_set_multicast_list;
-        netdev->set_mac_address = e100_set_mac_address;
-        netdev->change_mtu = e100_change_mtu;
-        netdev->do_ioctl = e100_do_ioctl;
         SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops);
-        netdev->tx_timeout = e100_tx_timeout;
         netdev->watchdog_timeo = E100_WATCHDOG_PERIOD;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        netdev->poll_controller = e100_netpoll;
-#endif
         strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 
         nic = netdev_priv(netdev);
@@ -2734,8 +2740,10 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 
         /* Wol magic packet can be enabled from eeprom */
         if((nic->mac >= mac_82558_D101_A4) &&
-           (nic->eeprom[eeprom_id] & eeprom_id_wol))
+           (nic->eeprom[eeprom_id] & eeprom_id_wol)) {
                 nic->flags |= wol_magic;
+                device_set_wakeup_enable(&pdev->dev, true);
+        }
 
         /* ack any pending wake events, disable PME */
         pci_pme_active(pdev, false);
@@ -2746,9 +2754,9 @@ static int __devinit e100_probe(struct pci_dev *pdev,
                 goto err_out_free;
         }
 
-        DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %s\n",
+        DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n",
                 (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0),
-                pdev->irq, print_mac(mac, netdev->dev_addr));
+                pdev->irq, netdev->dev_addr);
 
         return 0;
 
@@ -2794,11 +2802,10 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
         pci_save_state(pdev);
 
         if ((nic->flags & wol_magic) | e100_asf(nic)) {
-                pci_enable_wake(pdev, PCI_D3hot, 1);
-                pci_enable_wake(pdev, PCI_D3cold, 1);
+                if (pci_enable_wake(pdev, PCI_D3cold, true))
+                        pci_enable_wake(pdev, PCI_D3hot, true);
         } else {
-                pci_enable_wake(pdev, PCI_D3hot, 0);
-                pci_enable_wake(pdev, PCI_D3cold, 0);
+                pci_enable_wake(pdev, PCI_D3hot, false);
         }
 
         pci_disable_device(pdev);
@@ -2843,7 +2850,7 @@ static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel
         struct nic *nic = netdev_priv(netdev);
 
         /* Similar to calling e100_down(), but avoids adapter I/O. */
-        netdev->stop(netdev);
+        e100_close(netdev);
 
         /* Detach; put netif into a state similar to hotplug unplug. */
         napi_enable(&nic->napi);