From e50f5ab8293ad428345178e2102861f59611e8fd Mon Sep 17 00:00:00 2001 From: Rahul Kumar Gupta Date: Fri, 4 Oct 2047 04:14:31 +0800 Subject: meta-isg: dpdk : Fix for misleading indentation error Corrected the identation of code to match the block structure to avoid error/warning for build. Since yocto is using -Wall and -Werror flags so this warning is treated as error. Signed-off-by: Rahul Kumar Gupta Signed-off-by: Tom Zanussi --- meta-isg/common/recipes-extended/dpdk/dpdk.inc | 1 + ...6.04-Fix-for-misleading-indentation-error.patch | 56 ++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch (limited to 'meta-isg') diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc index a3131964..b92710ae 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc +++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc @@ -7,6 +7,7 @@ SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ file://dpdk-16.04-add-sysroot-option-within-app-makefile.patch \ file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ + file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ " COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch new file mode 100644 index 00000000..8786af7c --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch @@ -0,0 +1,56 @@ +From 8cd0a16af531cca0af6b4f9b729c252b8bdbf8e2 Mon Sep 17 00:00:00 2001 +From: Rahul Kumar Gupta +Date: Tue, 5 Jul 2016 00:05:25 +0800 +Subject: [PATCH] Fix for misleading indentation error + +fix the indentation of the code to match the block structure. This may cause +build errors if you have -Wall -Werror in your project. + +Signed-off-by: Rahul Kumar Gupta +--- + lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | 8 ++++---- + lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | 2 +- + 2 files changed, 5 insertions(+), 5 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 df22470..ba28eba 100644 +--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c ++++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c +@@ -3302,8 +3302,8 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data) + /* Disable access to mPHY if it was originally disabled */ + if (locked) + ready = e1000_is_mphy_ready(hw); +- if (!ready) +- return -E1000_ERR_PHY; ++ if (!ready) ++ return -E1000_ERR_PHY; + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, + E1000_MPHY_DIS_ACCESS); + +@@ -3367,8 +3367,8 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data, + /* Disable access to mPHY if it was originally disabled */ + if (locked) + ready = e1000_is_mphy_ready(hw); +- if (!ready) +- return -E1000_ERR_PHY; ++ 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 017dfe1..7248a7e 100644 +--- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c ++++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c +@@ -870,7 +870,7 @@ 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) && ++ if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) && + (hw->phy.smart_speed_active == false)) + autoc |= IXGBE_AUTOC_KR_SUPP; + if (speed & IXGBE_LINK_SPEED_1GB_FULL) +-- +1.9.1 + -- cgit v1.2.3-54-g00ecf