diff options
Diffstat (limited to 'drivers/net/atl1e/atl1e_ethtool.c')
-rw-r--r-- | drivers/net/atl1e/atl1e_ethtool.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c index 60edb9f232bb..ffd696ee7c8e 100644 --- a/drivers/net/atl1e/atl1e_ethtool.c +++ b/drivers/net/atl1e/atl1e_ethtool.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <linux/netdevice.h> | 23 | #include <linux/netdevice.h> |
24 | #include <linux/ethtool.h> | 24 | #include <linux/ethtool.h> |
25 | #include <linux/slab.h> | ||
25 | 26 | ||
26 | #include "atl1e.h" | 27 | #include "atl1e.h" |
27 | 28 | ||
@@ -131,11 +132,6 @@ static int atl1e_set_settings(struct net_device *netdev, | |||
131 | return 0; | 132 | return 0; |
132 | } | 133 | } |
133 | 134 | ||
134 | static u32 atl1e_get_tx_csum(struct net_device *netdev) | ||
135 | { | ||
136 | return (netdev->features & NETIF_F_HW_CSUM) != 0; | ||
137 | } | ||
138 | |||
139 | static u32 atl1e_get_msglevel(struct net_device *netdev) | 135 | static u32 atl1e_get_msglevel(struct net_device *netdev) |
140 | { | 136 | { |
141 | #ifdef DBG | 137 | #ifdef DBG |
@@ -145,10 +141,6 @@ static u32 atl1e_get_msglevel(struct net_device *netdev) | |||
145 | #endif | 141 | #endif |
146 | } | 142 | } |
147 | 143 | ||
148 | static void atl1e_set_msglevel(struct net_device *netdev, u32 data) | ||
149 | { | ||
150 | } | ||
151 | |||
152 | static int atl1e_get_regs_len(struct net_device *netdev) | 144 | static int atl1e_get_regs_len(struct net_device *netdev) |
153 | { | 145 | { |
154 | return AT_REGS_LEN * sizeof(u32); | 146 | return AT_REGS_LEN * sizeof(u32); |
@@ -387,18 +379,14 @@ static const struct ethtool_ops atl1e_ethtool_ops = { | |||
387 | .get_wol = atl1e_get_wol, | 379 | .get_wol = atl1e_get_wol, |
388 | .set_wol = atl1e_set_wol, | 380 | .set_wol = atl1e_set_wol, |
389 | .get_msglevel = atl1e_get_msglevel, | 381 | .get_msglevel = atl1e_get_msglevel, |
390 | .set_msglevel = atl1e_set_msglevel, | ||
391 | .nway_reset = atl1e_nway_reset, | 382 | .nway_reset = atl1e_nway_reset, |
392 | .get_link = ethtool_op_get_link, | 383 | .get_link = ethtool_op_get_link, |
393 | .get_eeprom_len = atl1e_get_eeprom_len, | 384 | .get_eeprom_len = atl1e_get_eeprom_len, |
394 | .get_eeprom = atl1e_get_eeprom, | 385 | .get_eeprom = atl1e_get_eeprom, |
395 | .set_eeprom = atl1e_set_eeprom, | 386 | .set_eeprom = atl1e_set_eeprom, |
396 | .get_tx_csum = atl1e_get_tx_csum, | 387 | .set_tx_csum = ethtool_op_set_tx_hw_csum, |
397 | .get_sg = ethtool_op_get_sg, | ||
398 | .set_sg = ethtool_op_set_sg, | 388 | .set_sg = ethtool_op_set_sg, |
399 | #ifdef NETIF_F_TSO | 389 | .set_tso = ethtool_op_set_tso, |
400 | .get_tso = ethtool_op_get_tso, | ||
401 | #endif | ||
402 | }; | 390 | }; |
403 | 391 | ||
404 | void atl1e_set_ethtool_ops(struct net_device *netdev) | 392 | void atl1e_set_ethtool_ops(struct net_device *netdev) |