Commit c4b1580e8ad1aab13e0d8b97c7af3eebab8791ae
Committed by
Jeff Garzik
Jeff Garzik
1 parent
290d4de5b7
[PATCH] sky2: drop broken wake on lan support
Remove wake on lan support for now. It doesn't work right, and I don't have a machine with working suspend/resume to test or fix it. It will be re-enabled later. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Showing 2 changed files with 0 additions and 37 deletions Side-by-side Diff
drivers/net/sky2.c
| ... | ... | @@ -2777,38 +2777,6 @@ |
| 2777 | 2777 | return err; |
| 2778 | 2778 | } |
| 2779 | 2779 | |
| 2780 | -#ifdef CONFIG_PM | |
| 2781 | -static void sky2_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) | |
| 2782 | -{ | |
| 2783 | - struct sky2_port *sky2 = netdev_priv(dev); | |
| 2784 | - | |
| 2785 | - wol->supported = WAKE_MAGIC; | |
| 2786 | - wol->wolopts = sky2->wol ? WAKE_MAGIC : 0; | |
| 2787 | -} | |
| 2788 | - | |
| 2789 | -static int sky2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) | |
| 2790 | -{ | |
| 2791 | - struct sky2_port *sky2 = netdev_priv(dev); | |
| 2792 | - struct sky2_hw *hw = sky2->hw; | |
| 2793 | - | |
| 2794 | - if (wol->wolopts != WAKE_MAGIC && wol->wolopts != 0) | |
| 2795 | - return -EOPNOTSUPP; | |
| 2796 | - | |
| 2797 | - sky2->wol = wol->wolopts == WAKE_MAGIC; | |
| 2798 | - | |
| 2799 | - if (sky2->wol) { | |
| 2800 | - memcpy_toio(hw->regs + WOL_MAC_ADDR, dev->dev_addr, ETH_ALEN); | |
| 2801 | - | |
| 2802 | - sky2_write16(hw, WOL_CTRL_STAT, | |
| 2803 | - WOL_CTL_ENA_PME_ON_MAGIC_PKT | | |
| 2804 | - WOL_CTL_ENA_MAGIC_PKT_UNIT); | |
| 2805 | - } else | |
| 2806 | - sky2_write16(hw, WOL_CTRL_STAT, WOL_CTL_DEFAULT); | |
| 2807 | - | |
| 2808 | - return 0; | |
| 2809 | -} | |
| 2810 | -#endif | |
| 2811 | - | |
| 2812 | 2780 | static int sky2_get_coalesce(struct net_device *dev, |
| 2813 | 2781 | struct ethtool_coalesce *ecmd) |
| 2814 | 2782 | { |
| ... | ... | @@ -2996,10 +2964,6 @@ |
| 2996 | 2964 | .set_ringparam = sky2_set_ringparam, |
| 2997 | 2965 | .get_pauseparam = sky2_get_pauseparam, |
| 2998 | 2966 | .set_pauseparam = sky2_set_pauseparam, |
| 2999 | -#ifdef CONFIG_PM | |
| 3000 | - .get_wol = sky2_get_wol, | |
| 3001 | - .set_wol = sky2_set_wol, | |
| 3002 | -#endif | |
| 3003 | 2967 | .phys_id = sky2_phys_id, |
| 3004 | 2968 | .get_stats_count = sky2_get_stats_count, |
| 3005 | 2969 | .get_ethtool_stats = sky2_get_ethtool_stats, |