Merge tag 'spdx-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / net / can / ti_hecc.c

diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 7ce26cd..b218fb3 100644 (file)
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
+#include <linux/ethtool.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/platform_device.h>
@@ -653,6 +654,7 @@ static void ti_hecc_change_state(struct net_device *ndev,
        can_change_state(priv->ndev, cf, tx_state, rx_state);
 
        if (max(tx_state, rx_state) != CAN_STATE_BUS_OFF) {
+               cf->can_id |= CAN_ERR_CNT;
                cf->data[6] = hecc_read(priv, HECC_CANTEC);
                cf->data[7] = hecc_read(priv, HECC_CANREC);
        }
@@ -831,6 +833,10 @@ static const struct net_device_ops ti_hecc_netdev_ops = {
        .ndo_change_mtu         = can_change_mtu,
 };
 
+static const struct ethtool_ops ti_hecc_ethtool_ops = {
+       .get_ts_info = ethtool_op_get_ts_info,
+};
+
 static const struct of_device_id ti_hecc_dt_ids[] = {
        {
                .compatible = "ti,am3517-hecc",
@@ -908,6 +914,7 @@ static int ti_hecc_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, ndev);
        SET_NETDEV_DEV(ndev, &pdev->dev);
        ndev->netdev_ops = &ti_hecc_netdev_ops;
+       ndev->ethtool_ops = &ti_hecc_ethtool_ops;
 
        priv->clk = clk_get(&pdev->dev, "hecc_ck");
        if (IS_ERR(priv->clk)) {