e1000: convert to ndo_fix_features

[pandora-kernel.git] / drivers / net / e1000 / e1000_ethtool.c

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index ec0fa42..c5f0f04 100644 (file)
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -290,69 +290,6 @@ static int e1000_set_pauseparam(struct net_device *netdev,
        return retval;
 }
 
-static u32 e1000_get_rx_csum(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       return adapter->rx_csum;
-}
-
-static int e1000_set_rx_csum(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       adapter->rx_csum = data;
-
-       if (netif_running(netdev))
-               e1000_reinit_locked(adapter);
-       else
-               e1000_reset(adapter);
-       return 0;
-}
-
-static u32 e1000_get_tx_csum(struct net_device *netdev)
-{
-       return (netdev->features & NETIF_F_HW_CSUM) != 0;
-}
-
-static int e1000_set_tx_csum(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (hw->mac_type < e1000_82543) {
-               if (!data)
-                       return -EINVAL;
-               return 0;
-       }
-
-       if (data)
-               netdev->features |= NETIF_F_HW_CSUM;
-       else
-               netdev->features &= ~NETIF_F_HW_CSUM;
-
-       return 0;
-}
-
-static int e1000_set_tso(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if ((hw->mac_type < e1000_82544) ||
-           (hw->mac_type == e1000_82547))
-               return data ? -EINVAL : 0;
-
-       if (data)
-               netdev->features |= NETIF_F_TSO;
-       else
-               netdev->features &= ~NETIF_F_TSO;
-
-       netdev->features &= ~NETIF_F_TSO6;
-
-       e_info(probe, "TSO is %s\n", data ? "Enabled" : "Disabled");
-       adapter->tso_force = true;
-       return 0;
-}
-
 static u32 e1000_get_msglevel(struct net_device *netdev)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -1905,12 +1842,6 @@ static const struct ethtool_ops e1000_ethtool_ops = {
        .set_ringparam          = e1000_set_ringparam,
        .get_pauseparam         = e1000_get_pauseparam,
        .set_pauseparam         = e1000_set_pauseparam,
-       .get_rx_csum            = e1000_get_rx_csum,
-       .set_rx_csum            = e1000_set_rx_csum,
-       .get_tx_csum            = e1000_get_tx_csum,
-       .set_tx_csum            = e1000_set_tx_csum,
-       .set_sg                 = ethtool_op_set_sg,
-       .set_tso                = e1000_set_tso,
        .self_test              = e1000_diag_test,
        .get_strings            = e1000_get_strings,
        .set_phys_id            = e1000_set_phys_id,