74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
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
|
|
@@ -1049,7 +1049,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,
|