| 123456789101112131415161718192021222324252627282930313233 |
- From 4af1474e6198b10fee7bb20e81f7e033ad1b586c Mon Sep 17 00:00:00 2001
- From: Jon Mason <jon.mason@broadcom.com>
- Date: Wed, 5 Oct 2016 15:36:49 -0400
- Subject: [PATCH] net: bgmac: Fix errant feature flag check
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- During the conversion to the feature flags, a check against
- ci->id != BCMA_CHIP_ID_BCM47162
- became
- bgmac->feature_flags & BGMAC_FEAT_CLKCTLS
- instead of
- !(bgmac->feature_flags & BGMAC_FEAT_CLKCTLS)
- Reported-by: Rafał Miłecki <zajec5@gmail.com>
- Signed-off-by: Jon Mason <jon.mason@broadcom.com>
- Signed-off-by: David S. Miller <davem@davemloft.net>
- ---
- drivers/net/ethernet/broadcom/bgmac.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- --- a/drivers/net/ethernet/broadcom/bgmac.c
- +++ b/drivers/net/ethernet/broadcom/bgmac.c
- @@ -1050,7 +1050,7 @@ static void bgmac_enable(struct bgmac *b
-
- mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
- BGMAC_DS_MM_SHIFT;
- - if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST || mode != 0)
- + if (!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLST) || mode != 0)
- bgmac_set(bgmac, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
- if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST && mode == 2)
- bgmac_cco_ctl_maskset(bgmac, 1, ~0,
|
