liquidio: ptp info

This patch has minor changes for proper ptp info retreival.

Signed-off-by: Derek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: Satanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: Felix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: Raghu Vatsavayi <rvatsavayi@caviumnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
index 88994c50e8556bbae585a7cb2859cad5d6695aea..85f5d178d0f687d32aefb936461c25291084691b 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
@@ -1416,23 +1416,28 @@ static int lio_get_ts_info(struct net_device *netdev,
        struct lio *lio = GET_LIO(netdev);
 
        info->so_timestamping =
+#ifdef PTP_HARDWARE_TIMESTAMPING
                SOF_TIMESTAMPING_TX_HARDWARE |
-               SOF_TIMESTAMPING_TX_SOFTWARE |
                SOF_TIMESTAMPING_RX_HARDWARE |
+               SOF_TIMESTAMPING_RAW_HARDWARE |
+               SOF_TIMESTAMPING_TX_SOFTWARE |
+#endif
                SOF_TIMESTAMPING_RX_SOFTWARE |
-               SOF_TIMESTAMPING_SOFTWARE | SOF_TIMESTAMPING_RAW_HARDWARE;
+               SOF_TIMESTAMPING_SOFTWARE;
 
        if (lio->ptp_clock)
                info->phc_index = ptp_clock_index(lio->ptp_clock);
        else
                info->phc_index = -1;
 
+#ifdef PTP_HARDWARE_TIMESTAMPING
        info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);
 
        info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |
                           (1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |
                           (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
                           (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT);
+#endif
 
        return 0;
 }