3 files changed, 26 insertions, 4 deletions

diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 1e9f321f1ac4..d189871e8e23 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -915,6 +915,11 @@ static u32 qed_sb_release(struct qed_dev *cdev,
         return rc;
 }
 
+static bool qed_can_link_change(struct qed_dev *cdev)
+{
+        return true;
+}
+
 static int qed_set_link(struct qed_dev *cdev,
                         struct qed_link_params *params)
 {
@@ -1177,6 +1182,7 @@ const struct qed_common_ops qed_common_ops_pass = {
         .sb_release = &qed_sb_release,
         .simd_handler_config = &qed_simd_handler_config,
         .simd_handler_clean = &qed_simd_handler_clean,
+        .can_link_change = &qed_can_link_change,
         .set_link = &qed_set_link,
         .get_link = &qed_get_current_link,
         .drain = &qed_drain,
diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
index 2ac98d44c1e1..f1dd25ac5552 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
@@ -239,9 +239,9 @@ static int qede_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         struct qed_link_params params;
         u32 speed;
 
-        if (!edev->dev_info.common.is_mf_default) {
+        if (!edev->ops || !edev->ops->common->can_link_change(edev->cdev)) {
                 DP_INFO(edev,
-                        "Link parameters can not be changed in non-default mode\n");
+                        "Link settings are not allowed to be changed\n");
                 return -EOPNOTSUPP;
         }
 
@@ -350,6 +350,12 @@ static int qede_nway_reset(struct net_device *dev)
         struct qed_link_output current_link;
         struct qed_link_params link_params;
 
+        if (!edev->ops || !edev->ops->common->can_link_change(edev->cdev)) {
+                DP_INFO(edev,
+                        "Link settings are not allowed to be changed\n");
+                return -EOPNOTSUPP;
+        }
+
         if (!netif_running(dev))
                 return 0;
 
@@ -450,9 +456,9 @@ static int qede_set_pauseparam(struct net_device *dev,
         struct qed_link_params params;
         struct qed_link_output current_link;
 
-        if (!edev->dev_info.common.is_mf_default) {
+        if (!edev->ops || !edev->ops->common->can_link_change(edev->cdev)) {
                 DP_INFO(edev,
-                        "Pause parameters can not be updated in non-default mode\n");
+                        "Pause settings are not allowed to be changed\n");
                 return -EOPNOTSUPP;
         }
 
diff --git a/include/linux/qed/qed_if.h b/include/linux/qed/qed_if.h
index 82a7fe011068..e5de42b62976 100644
--- a/include/linux/qed/qed_if.h
+++ b/include/linux/qed/qed_if.h
@@ -211,6 +211,16 @@ struct qed_common_ops {
 
         void            (*simd_handler_clean)(struct qed_dev *cdev,
                                               int index);
+
+/**
+ * @brief can_link_change - can the instance change the link or not
+ *
+ * @param cdev
+ *
+ * @return true if link-change is allowed, false otherwise.
+ */
+        bool (*can_link_change)(struct qed_dev *cdev);
+
 /**
  * @brief set_link - set links according to params
  *