Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / net / ethernet / mellanox / mlx4 / en_clock.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
index 57dda95..9990144 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
@@ -35,52 +35,6 @@
 
 #include "mlx4_en.h"
 
-int mlx4_en_timestamp_config(struct net_device *dev, int tx_type, int rx_filter)
-{
-       struct mlx4_en_priv *priv = netdev_priv(dev);
-       struct mlx4_en_dev *mdev = priv->mdev;
-       int port_up = 0;
-       int err = 0;
-
-       if (priv->hwtstamp_config.tx_type == tx_type &&
-           priv->hwtstamp_config.rx_filter == rx_filter)
-               return 0;
-
-       mutex_lock(&mdev->state_lock);
-       if (priv->port_up) {
-               port_up = 1;
-               mlx4_en_stop_port(dev, 1);
-       }
-
-       mlx4_en_free_resources(priv);
-
-       en_warn(priv, "Changing Time Stamp configuration\n");
-
-       priv->hwtstamp_config.tx_type = tx_type;
-       priv->hwtstamp_config.rx_filter = rx_filter;
-
-       if (rx_filter != HWTSTAMP_FILTER_NONE)
-               dev->features &= ~NETIF_F_HW_VLAN_CTAG_RX;
-       else
-               dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
-
-       err = mlx4_en_alloc_resources(priv);
-       if (err) {
-               en_err(priv, "Failed reallocating port resources\n");
-               goto out;
-       }
-       if (port_up) {
-               err = mlx4_en_start_port(dev);
-               if (err)
-                       en_err(priv, "Failed starting port\n");
-       }
-
-out:
-       mutex_unlock(&mdev->state_lock);
-       netdev_features_change(dev);
-       return err;
-}
-
 /* mlx4_en_read_clock - read raw cycle counter (to be used by time counter)
  */
 static cycle_t mlx4_en_read_clock(const struct cyclecounter *tc)