aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/qlogic/qed/qed.h4
-rw-r--r--drivers/net/ethernet/qlogic/qed/qed_dev.c6
-rw-r--r--drivers/net/ethernet/qlogic/qed/qed_mcp.c3
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h
index 61a9cd5be497..00c17fa6545b 100644
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -688,7 +688,9 @@ static inline u8 qed_concrete_to_sw_fid(struct qed_dev *cdev,
688#define OOO_LB_TC 9 688#define OOO_LB_TC 9
689 689
690int qed_configure_vport_wfq(struct qed_dev *cdev, u16 vp_id, u32 rate); 690int qed_configure_vport_wfq(struct qed_dev *cdev, u16 vp_id, u32 rate);
691void qed_configure_vp_wfq_on_link_change(struct qed_dev *cdev, u32 min_pf_rate); 691void qed_configure_vp_wfq_on_link_change(struct qed_dev *cdev,
692 struct qed_ptt *p_ptt,
693 u32 min_pf_rate);
692 694
693void qed_clean_wfq_db(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt); 695void qed_clean_wfq_db(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt);
694#define QED_LEADING_HWFN(dev) (&dev->hwfns[0]) 696#define QED_LEADING_HWFN(dev) (&dev->hwfns[0])
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index d6c5a8165b5f..e2a081ceaf52 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -3198,7 +3198,8 @@ int qed_configure_vport_wfq(struct qed_dev *cdev, u16 vp_id, u32 rate)
3198} 3198}
3199 3199
3200/* API to configure WFQ from mcp link change */ 3200/* API to configure WFQ from mcp link change */
3201void qed_configure_vp_wfq_on_link_change(struct qed_dev *cdev, u32 min_pf_rate) 3201void qed_configure_vp_wfq_on_link_change(struct qed_dev *cdev,
3202 struct qed_ptt *p_ptt, u32 min_pf_rate)
3202{ 3203{
3203 int i; 3204 int i;
3204 3205
@@ -3212,8 +3213,7 @@ void qed_configure_vp_wfq_on_link_change(struct qed_dev *cdev, u32 min_pf_rate)
3212 for_each_hwfn(cdev, i) { 3213 for_each_hwfn(cdev, i) {
3213 struct qed_hwfn *p_hwfn = &cdev->hwfns[i]; 3214 struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
3214 3215
3215 __qed_configure_vp_wfq_on_link_change(p_hwfn, 3216 __qed_configure_vp_wfq_on_link_change(p_hwfn, p_ptt,
3216 p_hwfn->p_dpc_ptt,
3217 min_pf_rate); 3217 min_pf_rate);
3218 } 3218 }
3219} 3219}
diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
index 314022df3469..87fde205149f 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -679,7 +679,8 @@ static void qed_mcp_handle_link_change(struct qed_hwfn *p_hwfn,
679 679
680 /* Min bandwidth configuration */ 680 /* Min bandwidth configuration */
681 __qed_configure_pf_min_bandwidth(p_hwfn, p_ptt, p_link, min_bw); 681 __qed_configure_pf_min_bandwidth(p_hwfn, p_ptt, p_link, min_bw);
682 qed_configure_vp_wfq_on_link_change(p_hwfn->cdev, p_link->min_pf_rate); 682 qed_configure_vp_wfq_on_link_change(p_hwfn->cdev, p_ptt,
683 p_link->min_pf_rate);
683 684
684 p_link->an = !!(status & LINK_STATUS_AUTO_NEGOTIATE_ENABLED); 685 p_link->an = !!(status & LINK_STATUS_AUTO_NEGOTIATE_ENABLED);
685 p_link->an_complete = !!(status & 686 p_link->an_complete = !!(status &