diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-04-07 03:32:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-07 23:19:01 -0400 |
commit | 782d640afd15af7a1faf01cfe566ca4ac511319d (patch) | |
tree | fdf50de5e124d1ee61c7dd20a6fef1c585e53b0e /drivers/net/atlx/atl2.c | |
parent | dc668910f4eaa233c241d43d96ed6b0b9258cc43 (diff) |
net: atl*: convert to hw_features
Things left as they were:
- atl1: is RX checksum really enabled?
- atl2: copy-paste from atl1, with-errors-on-modify I presume
- atl1c: there's a bug: MTU can't be changed if device is not up
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/atlx/atl2.c')
-rw-r--r-- | drivers/net/atlx/atl2.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index 937ef1afa5db..02761dd23fb8 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c | |||
@@ -1411,9 +1411,8 @@ static int __devinit atl2_probe(struct pci_dev *pdev, | |||
1411 | 1411 | ||
1412 | err = -EIO; | 1412 | err = -EIO; |
1413 | 1413 | ||
1414 | #ifdef NETIF_F_HW_VLAN_TX | 1414 | netdev->hw_features = NETIF_F_SG; |
1415 | netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); | 1415 | netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); |
1416 | #endif | ||
1417 | 1416 | ||
1418 | /* Init PHY as early as possible due to power saving issue */ | 1417 | /* Init PHY as early as possible due to power saving issue */ |
1419 | atl2_phy_init(&adapter->hw); | 1418 | atl2_phy_init(&adapter->hw); |
@@ -1840,11 +1839,6 @@ static int atl2_set_settings(struct net_device *netdev, | |||
1840 | return 0; | 1839 | return 0; |
1841 | } | 1840 | } |
1842 | 1841 | ||
1843 | static u32 atl2_get_tx_csum(struct net_device *netdev) | ||
1844 | { | ||
1845 | return (netdev->features & NETIF_F_HW_CSUM) != 0; | ||
1846 | } | ||
1847 | |||
1848 | static u32 atl2_get_msglevel(struct net_device *netdev) | 1842 | static u32 atl2_get_msglevel(struct net_device *netdev) |
1849 | { | 1843 | { |
1850 | return 0; | 1844 | return 0; |
@@ -2112,12 +2106,6 @@ static const struct ethtool_ops atl2_ethtool_ops = { | |||
2112 | .get_eeprom_len = atl2_get_eeprom_len, | 2106 | .get_eeprom_len = atl2_get_eeprom_len, |
2113 | .get_eeprom = atl2_get_eeprom, | 2107 | .get_eeprom = atl2_get_eeprom, |
2114 | .set_eeprom = atl2_set_eeprom, | 2108 | .set_eeprom = atl2_set_eeprom, |
2115 | .get_tx_csum = atl2_get_tx_csum, | ||
2116 | .get_sg = ethtool_op_get_sg, | ||
2117 | .set_sg = ethtool_op_set_sg, | ||
2118 | #ifdef NETIF_F_TSO | ||
2119 | .get_tso = ethtool_op_get_tso, | ||
2120 | #endif | ||
2121 | }; | 2109 | }; |
2122 | 2110 | ||
2123 | static void atl2_set_ethtool_ops(struct net_device *netdev) | 2111 | static void atl2_set_ethtool_ops(struct net_device *netdev) |