From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ob0-f195.google.com (mail-ob0-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id ABCE5AE06 for ; Tue, 21 Jun 2016 13:43:23 +0200 (CEST) Received: by mail-ob0-f195.google.com with SMTP id du1so2240512obc.3 for ; Tue, 21 Jun 2016 04:43:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:cc; bh=u8CHWKVnJINepi47kwAwZfnG5Cg3bL2lLF4mWDyJp4o=; b=oIgBW0i1pvh2gjjykkm105L9Yhv4s9mDUWRo0Lr/d1xX9RPPdovIXX+gkB3vpe9r9i 7YRunTolEByUKaGWAnt5VNuw2PLS9fMkQlYgYfxT9v9y+O5luf3ibL7NBs8QytzLPqaN v8lXBqDJ79n1e/yKrAjNNjfLYfeUMy/0MKxTxqsiNOx01Rb6PvkAASnjcroe+qbqpy+m 5pqLl7DLnSjP79JgtnX3AEpDoZP1+7uRqQO/JTqi2y7lIKp+8x03hLeKS9CVumDuDj2y 5ROibwIHRJESJrjwLq+PRjQTMKoMSD/mA1Q198ZjlkwPZP1g3L74xl56P96PDMukABTW 2AOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=u8CHWKVnJINepi47kwAwZfnG5Cg3bL2lLF4mWDyJp4o=; b=Zen+Ck1ib6byF4JPZSFTycAdl6mkZZmrpn9CtQnY87fUP/x1qhY76B8wYHpE8zkt+b nJUicPSZ73BebyPBMBFjDL4d+Rz7d729BniwL4tTq3AR2AQxd8juLIJHXp64Ud/Syxi2 AZANHWKoVtke0SavvoTa/V/x8pTq0QlTQbNfuUQ8KNdb9if7a2eaO9THAk9GgL8yH4xT 59FJ2ZDXx6jIgbRlpq6kRLDnih1OvjdrpOZag9zVsDMXGYjE8N3R5WgpF/3uFk6ZWK6q 4+gbkQOPs4FOMn6CboA7iFh2ApAKfbQ4YRCw7IOBTPpr0i6hXZZuWV4gmijQAu3IInLE bWwA== X-Gm-Message-State: ALyK8tL/7LXvSQEMLQQhqqvBpshEJhCLU9poEZlWLFxesCn6i+oVGl7zzo9v9dSEXg7ERGGSE3Zlx9UWafDPDg== X-Received: by 10.157.12.228 with SMTP id o33mr13183664otd.96.1466509403068; Tue, 21 Jun 2016 04:43:23 -0700 (PDT) MIME-Version: 1.0 Received: by 10.202.59.67 with HTTP; Tue, 21 Jun 2016 04:43:22 -0700 (PDT) From: Anupam Kapoor Date: Tue, 21 Jun 2016 17:13:22 +0530 Message-ID: To: dev@dpdk.org Cc: Ferruh Yigit Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: [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 11:43:24 -0000 This commit fixes build errors triggered due misleading indentation. Fixes: 38db3f7f50bde (e1000: update base driver) Fixes: 3fc5ca2f63529 (kni: initial import) Signed-off-by: Anupam Kapoor --- lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | 6 ++++-- lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | 3 ++- 2 files changed, 6 insertions(+), 3 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..140a2a476ed2 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c @@ -3300,12 +3300,13 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data) *data =3D E1000_READ_REG(hw, E1000_MPHY_DATA); /* Disable access to mPHY if it was originally disabled */ - if (locked) + if (locked) { ready =3D e1000_is_mphy_ready(hw); if (!ready) return -E1000_ERR_PHY; E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS); + } return E1000_SUCCESS; } @@ -3365,12 +3366,13 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data, E1000_WRITE_REG(hw, E1000_MPHY_DATA, data); /* Disable access to mPHY if it was originally disabled */ - if (locked) + if (locked) { ready =3D e1000_is_mphy_ready(hw); if (!ready) return -E1000_ERR_PHY; E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS); + } return E1000_SUCCESS; } 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..c6f4130d78ab 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c @@ -867,12 +867,13 @@ s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw, link_mode =3D=3D IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) { /* Set KX4/KX/KR support according to speed requested */ autoc &=3D ~(IXGBE_AUTOC_KX4_KX_SUPP_MASK | IXGBE_AUTOC_KR_SUPP); - if (speed & IXGBE_LINK_SPEED_10GB_FULL) + if (speed & IXGBE_LINK_SPEED_10GB_FULL) { if (orig_autoc & IXGBE_AUTOC_KX4_SUPP) autoc |=3D IXGBE_AUTOC_KX4_SUPP; if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) && (hw->phy.smart_speed_active =3D=3D false)) autoc |=3D IXGBE_AUTOC_KR_SUPP; + } if (speed & IXGBE_LINK_SPEED_1GB_FULL) autoc |=3D IXGBE_AUTOC_KX_SUPP; } else if ((pma_pmd_1g =3D=3D IXGBE_AUTOC_1G_SFI) && --=20 2.9.0 =E2=80=8B-- thanks anupam=E2=80=8B