diff options
-rw-r--r-- | drivers/staging/sxg/sxg_ethtool.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/sxg/sxg_ethtool.c b/drivers/staging/sxg/sxg_ethtool.c index a0632072a55..000c4d66e6f 100644 --- a/drivers/staging/sxg/sxg_ethtool.c +++ b/drivers/staging/sxg/sxg_ethtool.c | |||
@@ -161,14 +161,14 @@ static int sxg_nic_set_settings(struct net_device *netdev, | |||
161 | return -EOPNOTSUPP; | 161 | return -EOPNOTSUPP; |
162 | } | 162 | } |
163 | 163 | ||
164 | static int | 164 | static void |
165 | sxg_nic_get_strings(struct net_device *netdev, u32 stringset, u8 * data) | 165 | sxg_nic_get_strings(struct net_device *netdev, u32 stringset, u8 * data) |
166 | { | 166 | { |
167 | int index; | 167 | int index; |
168 | 168 | ||
169 | switch(stringset) { | 169 | switch(stringset) { |
170 | case ETH_SS_TEST: | 170 | case ETH_SS_TEST: |
171 | return -EOPNOTSUPP; | 171 | /* return -EOPNOTSUPP; */ |
172 | break; | 172 | break; |
173 | case ETH_SS_STATS: | 173 | case ETH_SS_STATS: |
174 | for (index = 0; index < SXG_NIC_STATS_LEN; index++) { | 174 | for (index = 0; index < SXG_NIC_STATS_LEN; index++) { |
@@ -228,7 +228,7 @@ static int sxg_nic_get_settings(struct net_device *netdev, | |||
228 | return 0; | 228 | return 0; |
229 | } | 229 | } |
230 | 230 | ||
231 | static int sxg_nic_get_rx_csum(struct net_device *netdev) | 231 | static u32 sxg_nic_get_rx_csum(struct net_device *netdev) |
232 | { | 232 | { |
233 | struct adapter_t *adapter = netdev_priv(netdev); | 233 | struct adapter_t *adapter = netdev_priv(netdev); |
234 | return ((adapter->flags & SXG_RCV_IP_CSUM_ENABLED) || | 234 | return ((adapter->flags & SXG_RCV_IP_CSUM_ENABLED) || |
@@ -266,11 +266,12 @@ static void sxg_nic_get_regs(struct net_device *netdev, | |||
266 | memcpy((buff+sizeof(struct sxg_hw_regs)), UcodeRegs, sizeof(struct sxg_ucode_regs)); | 266 | memcpy((buff+sizeof(struct sxg_hw_regs)), UcodeRegs, sizeof(struct sxg_ucode_regs)); |
267 | } | 267 | } |
268 | 268 | ||
269 | static int sxg_nic_get_wol(struct net_device *netdev, | 269 | static void sxg_nic_get_wol(struct net_device *netdev, |
270 | struct ethtool_wolinfo *wol) | 270 | struct ethtool_wolinfo *wol) |
271 | { | 271 | { |
272 | /* We dont support wake-on-lan */ | 272 | /* We dont support wake-on-lan */ |
273 | return -EOPNOTSUPP; | 273 | wol->supported = 0; |
274 | memset(&wol->sopass, 0, sizeof(wol->sopass)); | ||
274 | } | 275 | } |
275 | 276 | ||
276 | static int sxg_nic_get_eeprom_len(struct net_device *netdev) | 277 | static int sxg_nic_get_eeprom_len(struct net_device *netdev) |