diff options
| author |   Denis Bolotin <denis.bolotin@cavium.com> | 2018-11-19 16:28:30 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-11-19 18:38:15 -0800 |
| commit | 276d43f0ae963312c0cd0e2b9a85fd11ac65dfcc (patch) | |
| tree | cf272477414f37549f142cd25b2c6d0d7071c3ad /drivers/net/ethernet/qlogic | |
| parent | Merge branch 'ena-hibernation-and-rmmod-bug-fixes' (diff) | |
| download | linux-dev-276d43f0ae963312c0cd0e2b9a85fd11ac65dfcc.tar.xz linux-dev-276d43f0ae963312c0cd0e2b9a85fd11ac65dfcc.zip | |
qed: Fix bitmap_weight() check
Fix the condition which verifies that only one flag is set. The API
bitmap_weight() should receive size in bits instead of bytes.
Fixes: b5a9ee7cf3be ("qed: Revise QM cofiguration")
Signed-off-by: Denis Bolotin <denis.bolotin@cavium.com>
Signed-off-by: Michal Kalderon <michal.kalderon@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed_dev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index cff141077558..9b41e4ba53e5 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c @@ -485,8 +485,11 @@ static u16 *qed_init_qm_get_idx_from_flags(struct qed_hwfn *p_hwfn, struct qed_qm_info *qm_info = &p_hwfn->qm_info; /* Can't have multiple flags set here */ - if (bitmap_weight((unsigned long *)&pq_flags, sizeof(pq_flags)) > 1) + if (bitmap_weight((unsigned long *)&pq_flags, + sizeof(pq_flags) * BITS_PER_BYTE) > 1) { + DP_ERR(p_hwfn, "requested multiple pq flags 0x%x\n", pq_flags); goto err; + } switch (pq_flags) { case PQ_FLAGS_RLS: |