From 49bf928ea3c67e1843272ca3e847e210167c43c7 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 21 Jan 2009 08:12:10 -0800
Subject: [PATCH] --- yaml --- r: 141115 b: refs/heads/master c:
 a7c0ea6e954635c7c9c60a197320e2fd72a42078 h: refs/heads/master i:   141113:
 ccc89f9504e9b2622b4dfb9abe1db9dd4f120d74   141111:
 b5e75d6b216c45b4fce7f46e4e41e56720f0a2ad v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/sxg/sxg_ethtool.c | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b98527964f70..cd4988197b93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d41472746cec1f4d8e5c0ca12f4b1cd3819ea40
+refs/heads/master: a7c0ea6e954635c7c9c60a197320e2fd72a42078
diff --git a/trunk/drivers/staging/sxg/sxg_ethtool.c b/trunk/drivers/staging/sxg/sxg_ethtool.c
index a0632072a553..000c4d66e6fe 100644
--- a/trunk/drivers/staging/sxg/sxg_ethtool.c
+++ b/trunk/drivers/staging/sxg/sxg_ethtool.c
@@ -161,14 +161,14 @@ static int sxg_nic_set_settings(struct net_device *netdev,
 	return -EOPNOTSUPP;
 }
 
-static int
+static void
 sxg_nic_get_strings(struct net_device *netdev, u32 stringset, u8 * data)
 {
 	int index;
 
 	switch(stringset) {
-		case ETH_SS_TEST:
-			return -EOPNOTSUPP;
+	case ETH_SS_TEST:
+		/* return -EOPNOTSUPP; */
 		break;
 	case ETH_SS_STATS:
 		for (index = 0; index < SXG_NIC_STATS_LEN; index++) {
@@ -228,7 +228,7 @@ static int sxg_nic_get_settings(struct net_device *netdev,
 	return 0;
 }
 
-static int sxg_nic_get_rx_csum(struct net_device *netdev)
+static u32 sxg_nic_get_rx_csum(struct net_device *netdev)
 {
 	struct adapter_t *adapter = netdev_priv(netdev);
 	return ((adapter->flags & SXG_RCV_IP_CSUM_ENABLED) ||
@@ -266,11 +266,12 @@ static void sxg_nic_get_regs(struct net_device *netdev,
 	memcpy((buff+sizeof(struct sxg_hw_regs)), UcodeRegs, sizeof(struct sxg_ucode_regs));
 }
 
-static int sxg_nic_get_wol(struct net_device *netdev,
-				struct ethtool_wolinfo *wol)
+static void sxg_nic_get_wol(struct net_device *netdev,
+			    struct ethtool_wolinfo *wol)
 {
 	/* We dont support wake-on-lan */
-	return -EOPNOTSUPP;
+	wol->supported = 0;
+	memset(&wol->sopass, 0, sizeof(wol->sopass));
 }
 
 static int sxg_nic_get_eeprom_len(struct net_device *netdev)