diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-09 11:24:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-09 11:24:24 -0400 |
| commit | e735da5ec09526f197f3d8dd837d9a00e45e72aa (patch) | |
| tree | c3a75b7fe45cc2c93c3be2a191c662abdfd2c710 /drivers/net/ethernet/qlogic/qed/qed_dev.c | |
| parent | cf680179c111b1901e83bdd53997fb09dafff967 (diff) | |
| parent | be47c5555778fa3354950731023deb034a9e445e (diff) | |
| download | linux-e735da5ec09526f197f3d8dd837d9a00e45e72aa.tar.bz2 | |
Merge branch 'qed-general-fixes'
Yuval Mintz says:
====================
qed*: General fixes
This series contain several fixes for qed and qede.
- #1 [and ~#5] relate to XDP cleanups
- #2 and #5 correct VF behavior
- #3 and #4 fix and add missing configurations needed for RoCE & storage
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qed/qed_dev.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index bb70522ad362..463927f17032 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c @@ -1370,7 +1370,7 @@ qed_hw_init_pf_doorbell_bar(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) NULL) + qed_cxt_get_proto_cid_count(p_hwfn, PROTOCOLID_ETH, NULL); - norm_regsize = roundup(QED_PF_DEMS_SIZE * non_pwm_conn, 4096); + norm_regsize = roundup(QED_PF_DEMS_SIZE * non_pwm_conn, PAGE_SIZE); min_addr_reg1 = norm_regsize / 4096; pwm_regsize = db_bar_size - norm_regsize; |