net: hns3: up/down netdev in hclge module when setting mtu (cdca4c48) · Commits · 戴 / test

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -1573,18 +1573,11 @@ static int hns3_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan,
		static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu)
		{
		struct hnae3_handle *h = hns3_get_handle(netdev);
		bool if_running = netif_running(netdev);
		int ret;

		if (!h->ae_algo->ops->set_mtu)
		return -EOPNOTSUPP;

		/* if this was called with netdev up then bring netdevice down */
		if (if_running) {
		(void)hns3_nic_net_stop(netdev);
		msleep(100);
		}

		ret = h->ae_algo->ops->set_mtu(h, new_mtu);
		if (ret)
		netdev_err(netdev, "failed to change MTU in hardware %d\n",
		@@ -1592,10 +1585,6 @@ static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu)
		else
		netdev->mtu = new_mtu;

		/* if the netdev was running earlier, bring it up again */
		if (if_running && hns3_nic_net_open(netdev))
		ret = -EINVAL;

		return ret;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -6450,6 +6450,8 @@ int hclge_set_vport_mtu(struct hclge_vport *vport, int new_mtu)
		return -EINVAL;
		}

		hclge_notify_client(hdev, HNAE3_DOWN_CLIENT);

		ret = hclge_set_mac_mtu(hdev, max_frm_size);
		if (ret) {
		dev_err(&hdev->pdev->dev,
		@@ -6466,6 +6468,7 @@ int hclge_set_vport_mtu(struct hclge_vport *vport, int new_mtu)
		"Allocate buffer fail, ret =%d\n", ret);

		out:
		hclge_notify_client(hdev, HNAE3_UP_CLIENT);
		mutex_unlock(&hdev->vport_lock);
		return ret;
		}