From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id F402A6CC7 for ; Tue, 21 Jun 2016 12:10:14 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP; 21 Jun 2016 03:10:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,503,1459839600"; d="scan'208";a="1006555722" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.237.220.90]) ([10.237.220.90]) by fmsmga002.fm.intel.com with ESMTP; 21 Jun 2016 03:10:13 -0700 To: Anupam Kapoor , dev@dpdk.org References: <87eg7ros2m.fsf@fatcat.parallelwireless> From: Ferruh Yigit Message-ID: <57691284.4090900@intel.com> Date: Tue, 21 Jun 2016 11:10:12 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <87eg7ros2m.fsf@fatcat.parallelwireless> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH] kni : fix build errors for gcc --version >= 6.1 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2016 10:10:15 -0000 Hi Anupam, Thank you for the patch. On 6/21/2016 9:37 AM, Anupam Kapoor wrote: > This commit fixes build errors triggered due misleading indentation. > > Fixes: 366113dbfb696 (e1000: suppress misleading indentation warning) This looks like wrong commit id that fixed, can you please double check Also you may need two fixes lines, since fixing two different driver files > > > Signed-off-by: Anupam Kapoor > --- > lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | 12 ++++++++---- > lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | 6 +++--- > 2 files changed, 11 insertions(+), 7 deletions(-) > > diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c > index df224702ed7d..26352da15101 100644 > --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c > +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c > @@ -3299,13 +3299,15 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data) > return -E1000_ERR_PHY; > *data = E1000_READ_REG(hw, E1000_MPHY_DATA); > > - /* Disable access to mPHY if it was originally disabled */ > - if (locked) > + /* Disable access to mPHY if it was originally enabled */ I think original comment is correct. As far as I can see, if access disabled in the beginning of the function, it is enabled and here disabled back. Original state saved to locked variable. > + if (locked) { > ready = e1000_is_mphy_ready(hw); > if (!ready) > return -E1000_ERR_PHY; > + > E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, > E1000_MPHY_DIS_ACCESS); > + } > ... > diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c > index 017dfe16c73f..dc2a4fb61c25 100644 > --- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c > +++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c > @@ -870,9 +870,9 @@ s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw, > if (speed & IXGBE_LINK_SPEED_10GB_FULL) > if (orig_autoc & IXGBE_AUTOC_KX4_SUPP) > autoc |= IXGBE_AUTOC_KX4_SUPP; > - if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) && > - (hw->phy.smart_speed_active == false)) > - autoc |= IXGBE_AUTOC_KR_SUPP; > + if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) && > + (hw->phy.smart_speed_active == false)) > + autoc |= IXGBE_AUTOC_KR_SUPP; Can you please check following commit: https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=55461ddbc > if (speed & IXGBE_LINK_SPEED_1GB_FULL) > autoc |= IXGBE_AUTOC_KX_SUPP; > } else if ((pma_pmd_1g == IXGBE_AUTOC_1G_SFI) && > -- > 2.9.0 > Would you mind sending a new version of patch according above comments? Thanks, ferruh