target/linux/generic/patches-4.4/071-v4.9-0003-net-bgmac-Fix-errant-feature-flag-check.patch

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