Merge branch 'net-mscc-allow-forwarding-ioctl-operations-to-attached-PHYs' (4a11c551) · Commits · 戴 / test

drivers/net/ethernet/mscc/ocelot.c

+12 −11

Original line number	Diff line number	Diff line
		@@ -1204,20 +1204,21 @@ static int ocelot_ioctl(struct net_device dev, struct ifreq ifr, int cmd)
		struct ocelot *ocelot = priv->port.ocelot;
		int port = priv->chip_port;

		/* The function is only used for PTP operations for now */
		if (!ocelot->ptp)
		return -EOPNOTSUPP;

		/* If the attached PHY device isn't capable of timestamping operations,
		* use our own (when possible).
		*/
		if (!phy_has_hwtstamp(dev->phydev) && ocelot->ptp) {
		switch (cmd) {
		case SIOCSHWTSTAMP:
		return ocelot_hwstamp_set(ocelot, port, ifr);
		case SIOCGHWTSTAMP:
		return ocelot_hwstamp_get(ocelot, port, ifr);
		default:
		return -EOPNOTSUPP;
		}
		}

		return phy_mii_ioctl(dev->phydev, ifr, cmd);
		}

		static const struct net_device_ops ocelot_port_netdev_ops = {
		.ndo_open = ocelot_port_open,
		.ndo_stop = ocelot_port_stop,

+2 −1

Original line number	Diff line number	Diff line
		@@ -189,6 +189,7 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg)
		skb->offload_fwd_mark = 1;

		skb->protocol = eth_type_trans(skb, dev);
		if (!skb_defer_rx_timestamp(skb))
		netif_rx(skb);
		dev->stats.rx_bytes += len;
		dev->stats.rx_packets++;