Commit 90e8ca0a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'devlink-next' 



Jakub Kicinski says:

====================
devlink: fix reload notifications and remove features

First two patches adjust notifications during devlink reload.
The last patch removes no longer needed devlink features.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 166a1a5a fb8421a9

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+0 −1
Original line number Diff line number Diff line
@@ -1303,7 +1303,6 @@ int bnxt_dl_register(struct bnxt *bp) 
	if (rc)

		goto err_dl_port_unreg;



	devlink_set_features(dl, DEVLINK_F_RELOAD);

out:

	devlink_register(dl);

	return 0;

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ int hclge_devlink_init(struct hclge_dev *hdev) 
	priv->hdev = hdev;

	hdev->devlink = devlink;



	devlink_set_features(devlink, DEVLINK_F_RELOAD);

	devlink_register(devlink);

	return 0;

}

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ int hclgevf_devlink_init(struct hclgevf_dev *hdev) 
	priv->hdev = hdev;

	hdev->devlink = devlink;



	devlink_set_features(devlink, DEVLINK_F_RELOAD);

	devlink_register(devlink);

	return 0;

}

drivers/net/ethernet/intel/ice/ice_devlink.c

+0 −1
Original line number Diff line number Diff line
@@ -1376,7 +1376,6 @@ void ice_devlink_register(struct ice_pf *pf) 
{

	struct devlink *devlink = priv_to_devlink(pf);



	devlink_set_features(devlink, DEVLINK_F_RELOAD);

	devlink_register(devlink);

}

drivers/net/ethernet/mellanox/mlx4/main.c

+0 −1
Original line number Diff line number Diff line
@@ -4031,7 +4031,6 @@ static int mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto err_params_unregister;



	pci_save_state(pdev);

	devlink_set_features(devlink, DEVLINK_F_RELOAD);

	devl_unlock(devlink);

	devlink_register(devlink);

	return 0;