dummy_can: fix packet statistics

index 41953655e3d3..a77f5fc5cfda 100644
@@ -207,17 +207,60 @@ static int dummy_can_netdev_close(struct net_device *dev)
 }
 
 static netdev_tx_t dummy_can_start_xmit(struct sk_buff *skb,
 					struct net_device *dev)
 {
+	struct net_device_stats *stats = &dev->stats;
+	unsigned int len;
+	bool loop;
+
 	if (can_dev_dropped_skb(dev, skb))
 		return NETDEV_TX_OK;
 
-	can_put_echo_skb(skb, dev, 0, 0);
-	dev->stats.tx_packets++;
-	dev->stats.tx_bytes += can_get_echo_skb(dev, 0, NULL);
+	len = can_skb_get_data_len(skb);
+	stats->tx_packets++;
+	stats->tx_bytes += len;
+
+	/* set flag whether this packet has to be looped back */
+	loop = skb->pkt_type == PACKET_LOOPBACK;
+
+	skb_tx_timestamp(skb);
+
+	/* driver supports echo handling - see dummy_can_init() */
+	if (!(dev->flags & IFF_ECHO)) {
+		/* no echo handling available inside this driver */
+		if (loop) {
+			/* only count the packets here, because the
+			 * CAN core already did the echo for us
+			 */
+			stats->rx_packets++;
+			stats->rx_bytes += len;
+		}
+		consume_skb(skb);
+		return NETDEV_TX_OK;
+	}
+
+	/* perform standard echo handling for CAN network interfaces */
+
+	if (loop) {
+		skb = can_create_echo_skb(skb);
+		if (!skb)
+			return NETDEV_TX_OK;
 
+		/* receive with packet counting */
+		stats->rx_packets++;
+		stats->rx_bytes += len;
+
+		skb->pkt_type  = PACKET_BROADCAST;
+		skb->dev       = dev;
+		skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+		netif_rx(skb);
+	} else {
+		/* no looped packets => no counting */
+		consume_skb(skb);
+	}
 	return NETDEV_TX_OK;
 }
 
 static const struct net_device_ops dummy_can_netdev_ops = {
 	.ndo_open = dummy_can_netdev_open,

@@ -239,10 +282,11 @@ static int __init dummy_can_init(void)
 	if (!dev)
 		return -ENOMEM;
 
 	dev->netdev_ops = &dummy_can_netdev_ops;
 	dev->ethtool_ops = &dummy_can_ethtool_ops;
+	dev->flags |= IFF_ECHO; /* enable echo handling */
 	priv = netdev_priv(dev);
 	priv->can.bittiming_const = &dummy_can_bittiming_const;
 	priv->can.bitrate_max = 20 * MEGA /* BPS */;
 	priv->can.clock.freq = 160 * MEGA /* Hz */;
 	priv->can.fd.data_bittiming_const = &dummy_can_fd_databittiming_const;