summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorTomer Tayar <Tomer.Tayar@cavium.com>2017-05-21 12:10:59 +0300
committerDavid S. Miller <davem@davemloft.net>2017-05-21 12:56:53 -0400
commitb19601bbf1a1a230beb35ea77acbbfb5bbf542fa (patch)
tree761e8ee057f5812f6f8cedf19e887cddc8f7df6b /drivers/net/ethernet
parent2e7022d64e77dae5972f125f9ce95c012dfe7b3a (diff)
downloadop-kernel-dev-b19601bbf1a1a230beb35ea77acbbfb5bbf542fa.zip
op-kernel-dev-b19601bbf1a1a230beb35ea77acbbfb5bbf542fa.tar.gz
qed: Fix setting of Management bitfields
The management firmware HSI contains masks which are already shifted to their right place, so QED_MFW_SET_FIELD() is clearing incorrect fields by shifting the mask by the offset. Luckily, today we set the fields in an incrementing order [so we're not erasing any previously set fields], but this still needs fixing. Signed-off-by: Tomer Tayar <Tomer.Tayar@cavium.com> Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/qlogic/qed/qed.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h
index 162cd7f..fd8cf31 100644
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -92,7 +92,7 @@ enum qed_mcp_protocol_type;
#define QED_MFW_SET_FIELD(name, field, value) \
do { \
- (name) &= ~((field ## _MASK) << (field ## _SHIFT)); \
+ (name) &= ~(field ## _MASK); \
(name) |= (((value) << (field ## _SHIFT)) & (field ## _MASK));\
} while (0)
OpenPOWER on IntegriCloud