Merge branch 'hns-fixes' (417c8045) · Commits · 戴 / test

drivers/net/ethernet/hisilicon/hns/hns_enet.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -2418,6 +2418,8 @@ static int hns_nic_dev_probe(struct platform_device *pdev)
		out_notify_fail:
		(void)cancel_work_sync(&priv->service_task);
		out_read_prop_fail:
		/* safe for ACPI FW */
		of_node_put(to_of_node(priv->fwnode));
		free_netdev(ndev);
		return ret;
		}
		@@ -2447,6 +2449,9 @@ static int hns_nic_dev_remove(struct platform_device *pdev)
		set_bit(NIC_STATE_REMOVING, &priv->state);
		(void)cancel_work_sync(&priv->service_task);

		/* safe for ACPI FW */
		of_node_put(to_of_node(priv->fwnode));

		free_netdev(ndev);
		return 0;
		}

+9 −7

Original line number	Diff line number	Diff line
		@@ -1157,16 +1157,18 @@ static int hns_get_regs_len(struct net_device *net_dev)
		*/
		static int hns_nic_nway_reset(struct net_device *netdev)
		{
		int ret = 0;
		struct phy_device *phy = netdev->phydev;

		if (netif_running(netdev)) {
		/* if autoneg is disabled, don't restart auto-negotiation */
		if (phy && phy->autoneg == AUTONEG_ENABLE)
		ret = genphy_restart_aneg(phy);
		}
		if (!netif_running(netdev))
		return 0;

		return ret;
		if (!phy)
		return -EOPNOTSUPP;

		if (phy->autoneg != AUTONEG_ENABLE)
		return -EINVAL;

		return genphy_restart_aneg(phy);
		}

		static u32

+1 −1

Original line number	Diff line number	Diff line
		@@ -321,7 +321,7 @@ static int hns_mdio_read(struct mii_bus *bus, int phy_id, int regnum)
		}

		hns_mdio_cmd_write(mdio_dev, is_c45,
		MDIO_C45_WRITE_ADDR, phy_id, devad);
		MDIO_C45_READ, phy_id, devad);
		}

		/* Step 5: waitting for MDIO_COMMAND_REG 's mdio_start==0,*/