cxgb4: Remove setting of RX software timestamp

The responsibility for reporting of RX software timestamp has moved to
the core layer (see __ethtool_get_ts_info()), remove usage from the
device drivers.

Reviewed-by: Carolina Jubran <cjubran@nvidia.com>
Reviewed-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Signed-off-by: Gal Pressman <gal@nvidia.com>
Reviewed-by: Potnuri Bharat Teja <bharat@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
index 3d091947ae00f0838ed8b76e7088d08ea64d9d3e..7f3f5afa864f4a58c8b0adf2a1ec333b9a4bac1e 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
@@ -1556,12 +1556,9 @@ static int get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *ts
        struct  adapter *adapter = pi->adapter;
 
        ts_info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
-                                  SOF_TIMESTAMPING_RX_SOFTWARE |
-                                  SOF_TIMESTAMPING_SOFTWARE;
-
-       ts_info->so_timestamping |= SOF_TIMESTAMPING_RX_HARDWARE |
-                                   SOF_TIMESTAMPING_TX_HARDWARE |
-                                   SOF_TIMESTAMPING_RAW_HARDWARE;
+                                  SOF_TIMESTAMPING_RX_HARDWARE |
+                                  SOF_TIMESTAMPING_TX_HARDWARE |
+                                  SOF_TIMESTAMPING_RAW_HARDWARE;
 
        ts_info->tx_types = (1 << HWTSTAMP_TX_OFF) |
                            (1 << HWTSTAMP_TX_ON);
@@ -1575,8 +1572,6 @@ static int get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *ts
 
        if (adapter->ptp_clock)
                ts_info->phc_index = ptp_clock_index(adapter->ptp_clock);
-       else
-               ts_info->phc_index = -1;
 
        return 0;
 }