ethernet: Remove vf rate limit check for drivers

The commit a14857c27a50 ("rtnetlink: verify rate parameters for calls to
ndo_set_vf_rate") has been merged to master, so we can to remove the
now-duplicate checks in drivers.

Signed-off-by: Bin Chen <bin.chen@corigine.com>
Signed-off-by: Baowen Zheng <baowen.zheng@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20220609084717.155154-1-simon.horman@corigine.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index ddf2f3963abeef81f35d3580f500af1c4bc223ff..c4ed43604ddcdfbc4c51c083c89cf12e12fe56eb 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -307,7 +307,7 @@ int bnxt_set_vf_bw(struct net_device *dev, int vf_id, int min_tx_rate,
                return -EINVAL;
        }
 
-       if (min_tx_rate > pf_link_speed || min_tx_rate > max_tx_rate) {
+       if (min_tx_rate > pf_link_speed) {
                netdev_info(bp->dev, "min tx rate %d is invalid for VF %d\n",
                            min_tx_rate, vf_id);
                return -EINVAL;

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_sriov.c b/drivers/net/ethernet/huawei/hinic/hinic_sriov.c
index 01e7d3c0b68ed3020afeee4bb7df8da6794f8b0a..df555847afb56a20ee58c35087e01cb47e18a3d5 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_sriov.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_sriov.c
@@ -852,12 +852,6 @@ int hinic_ndo_set_vf_bw(struct net_device *netdev,
                return -EINVAL;
        }
 
-       if (max_tx_rate < min_tx_rate) {
-               netif_err(nic_dev, drv, netdev, "Max rate %d must be greater than or equal to min rate %d\n",
-                         max_tx_rate, min_tx_rate);
-               return -EINVAL;
-       }
-
        err = hinic_port_link_state(nic_dev, &link_state);
        if (err) {
                netif_err(nic_dev, drv, netdev,

diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
index bb1721f1321db85a0ced65ed5d9e0770c4138dfe..86093b2511d8603f18e44d613e5bb4c5b185175e 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_sriov.c
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
@@ -1593,16 +1593,6 @@ ice_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,
                goto out_put_vf;
        }
 
-       /* when max_tx_rate is zero that means no max Tx rate limiting, so only
-        * check if max_tx_rate is non-zero
-        */
-       if (max_tx_rate && min_tx_rate > max_tx_rate) {
-               dev_err(dev, "Cannot set min Tx rate %d Mbps greater than max Tx rate %d Mbps\n",
-                       min_tx_rate, max_tx_rate);
-               ret = -EINVAL;
-               goto out_put_vf;
-       }
-
        if (min_tx_rate && ice_is_dcb_active(pf)) {
                dev_err(dev, "DCB on PF is currently enabled. VF min Tx rate limiting not allowed on this PF.\n");
                ret = -EOPNOTSUPP;

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
index e90fa97c0ae6c36bf18fffb822d78ce4f77448f8..8dd7aa08ecfb8d18396b986b9fd917abe9a0e3d3 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
@@ -1869,8 +1869,7 @@ int qlcnic_sriov_set_vf_tx_rate(struct net_device *netdev, int vf,
        if (!min_tx_rate)
                min_tx_rate = QLC_VF_MIN_TX_RATE;
 
-       if (max_tx_rate &&
-           (max_tx_rate >= 10000 || max_tx_rate < min_tx_rate)) {
+       if (max_tx_rate && max_tx_rate >= 10000) {
                netdev_err(netdev,
                           "Invalid max Tx rate, allowed range is [%d - %d]",
                           min_tx_rate, QLC_VF_MAX_TX_RATE);
@@ -1880,8 +1879,7 @@ int qlcnic_sriov_set_vf_tx_rate(struct net_device *netdev, int vf,
        if (!max_tx_rate)
                max_tx_rate = 10000;
 
-       if (min_tx_rate &&
-           (min_tx_rate > max_tx_rate || min_tx_rate < QLC_VF_MIN_TX_RATE)) {
+       if (min_tx_rate && min_tx_rate < QLC_VF_MIN_TX_RATE) {
                netdev_err(netdev,
                           "Invalid min Tx rate, allowed range is [%d - %d]",
                           QLC_VF_MIN_TX_RATE, max_tx_rate);