From ac936929092dc6a5409b627c4c67305ab9b626b3 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 1 Dec 2009 19:09:52 +0000 Subject: atl1e: Allow TX checksum offload and TSO to be disabled and reenabled Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller --- drivers/net/atl1e/atl1e_ethtool.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/net/atl1e/atl1e_ethtool.c') diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c index 60edb9f232bb..b0fb7254e2cb 100644 --- a/drivers/net/atl1e/atl1e_ethtool.c +++ b/drivers/net/atl1e/atl1e_ethtool.c @@ -394,11 +394,13 @@ static const struct ethtool_ops atl1e_ethtool_ops = { .get_eeprom = atl1e_get_eeprom, .set_eeprom = atl1e_set_eeprom, .get_tx_csum = atl1e_get_tx_csum, + .set_tx_csum = ethtool_op_set_tx_hw_csum, .get_sg = ethtool_op_get_sg, .set_sg = ethtool_op_set_sg, #ifdef NETIF_F_TSO .get_tso = ethtool_op_get_tso, #endif + .set_tso = ethtool_op_set_tso, }; void atl1e_set_ethtool_ops(struct net_device *netdev) -- cgit v1.2.3 From 95fec16869f22e94ff13dc5731aeba36bc47bbe6 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 1 Dec 2009 19:10:03 +0000 Subject: atl1e: Remove redundant definitions of ethtool operations These functions provide the default behaviour and do not need to be set in struct ethtool_ops. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller --- drivers/net/atl1e/atl1e_ethtool.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'drivers/net/atl1e/atl1e_ethtool.c') diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c index b0fb7254e2cb..bb15c51b9180 100644 --- a/drivers/net/atl1e/atl1e_ethtool.c +++ b/drivers/net/atl1e/atl1e_ethtool.c @@ -131,11 +131,6 @@ static int atl1e_set_settings(struct net_device *netdev, return 0; } -static u32 atl1e_get_tx_csum(struct net_device *netdev) -{ - return (netdev->features & NETIF_F_HW_CSUM) != 0; -} - static u32 atl1e_get_msglevel(struct net_device *netdev) { #ifdef DBG @@ -393,13 +388,8 @@ static const struct ethtool_ops atl1e_ethtool_ops = { .get_eeprom_len = atl1e_get_eeprom_len, .get_eeprom = atl1e_get_eeprom, .set_eeprom = atl1e_set_eeprom, - .get_tx_csum = atl1e_get_tx_csum, .set_tx_csum = ethtool_op_set_tx_hw_csum, - .get_sg = ethtool_op_get_sg, .set_sg = ethtool_op_set_sg, -#ifdef NETIF_F_TSO - .get_tso = ethtool_op_get_tso, -#endif .set_tso = ethtool_op_set_tso, }; -- cgit v1.2.3 From 650de8de16aa7c168c34d1b6a3191e4a5e2648c8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 1 Dec 2009 19:10:18 +0000 Subject: atl1e: Remove non-implementation of ethtool set_msglevel() operation Unimplemented operations should not silently fail. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller --- drivers/net/atl1e/atl1e_ethtool.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'drivers/net/atl1e/atl1e_ethtool.c') diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c index bb15c51b9180..a76006c1bc6b 100644 --- a/drivers/net/atl1e/atl1e_ethtool.c +++ b/drivers/net/atl1e/atl1e_ethtool.c @@ -140,10 +140,6 @@ static u32 atl1e_get_msglevel(struct net_device *netdev) #endif } -static void atl1e_set_msglevel(struct net_device *netdev, u32 data) -{ -} - static int atl1e_get_regs_len(struct net_device *netdev) { return AT_REGS_LEN * sizeof(u32); @@ -382,7 +378,6 @@ static const struct ethtool_ops atl1e_ethtool_ops = { .get_wol = atl1e_get_wol, .set_wol = atl1e_set_wol, .get_msglevel = atl1e_get_msglevel, - .set_msglevel = atl1e_set_msglevel, .nway_reset = atl1e_nway_reset, .get_link = ethtool_op_get_link, .get_eeprom_len = atl1e_get_eeprom_len, -- cgit v1.2.3