diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2017-01-31 21:00:51 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2017-01-31 22:04:08 +0100 |
| commit | 7583de2e8fdc2fdcfb16dfd431590a4b4611bf52 (patch) | |
| tree | 9e9906afb0a4531a2c0de72356d0b7c3cedd029a /target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch | |
| parent | 4d10030c3ce822bc4e95aa134a5c61a7c34bc13f (diff) | |
| download | upstream-7583de2e8fdc2fdcfb16dfd431590a4b4611bf52.tar.gz upstream-7583de2e8fdc2fdcfb16dfd431590a4b4611bf52.tar.bz2 upstream-7583de2e8fdc2fdcfb16dfd431590a4b4611bf52.zip | |
kernel: rename bgmac patches to squeeze them
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 <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch b/target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch deleted file mode 100644 index 830d8ccde4..0000000000 --- a/target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -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, |