From 7583de2e8fdc2fdcfb16dfd431590a4b4611bf52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 31 Jan 2017 21:00:51 +0100 Subject: kernel: rename bgmac patches to squeeze them MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a pure rename without any changes. It makes maintaining bgmac simpler and will hopefully make adding new kernel a bit easier. Signed-off-by: Rafał Miłecki --- ...3-net-bgmac-Fix-errant-feature-flag-check.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 target/linux/generic/patches-4.4/071-v4.9-0003-net-bgmac-Fix-errant-feature-flag-check.patch (limited to 'target/linux/generic/patches-4.4/071-v4.9-0003-net-bgmac-Fix-errant-feature-flag-check.patch') diff --git a/target/linux/generic/patches-4.4/071-v4.9-0003-net-bgmac-Fix-errant-feature-flag-check.patch b/target/linux/generic/patches-4.4/071-v4.9-0003-net-bgmac-Fix-errant-feature-flag-check.patch new file mode 100644 index 0000000..830d8cc --- /dev/null +++ b/target/linux/generic/patches-4.4/071-v4.9-0003-net-bgmac-Fix-errant-feature-flag-check.patch @@ -0,0 +1,33 @@ +From 4af1474e6198b10fee7bb20e81f7e033ad1b586c Mon Sep 17 00:00:00 2001 +From: Jon Mason +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 +Signed-off-by: Jon Mason +Signed-off-by: David S. Miller +--- + 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, -- cgit v1.1