]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - drivers/net/skge.c
ath9k: Add debug counters for TX
[mv-sheeva.git] / drivers / net / skge.c
index c11cdd08ec5701ea2b4b9fe3dca92b1727ca2b69..543af2044f40df39eea68d5eef6608dc1847613a 100644 (file)
@@ -2837,8 +2837,6 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
                netif_stop_queue(dev);
        }
 
-       dev->trans_start = jiffies;
-
        return NETDEV_TX_OK;
 }
 
@@ -3856,8 +3854,10 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
        skge->speed = -1;
        skge->advertising = skge_supported_modes(hw);
 
-       if (device_may_wakeup(&hw->pdev->dev))
+       if (device_can_wakeup(&hw->pdev->dev)) {
                skge->wol = wol_supported(hw) & WAKE_MAGIC;
+               device_set_wakeup_enable(&hw->pdev->dev, skge->wol);
+       }
 
        hw->dev[port] = dev;